linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #01850
[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2232: GCC TDM 4.5.1 has just out, revert workaround
------------------------------------------------------------
revno: 2232
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Thu 2010-09-02 20:16:12 +0200
message:
GCC TDM 4.5.1 has just out, revert workaround
modified:
Compile.txt
dwt/src/Theme.cpp
dwt/src/widgets/Grid.cpp
dwt/src/widgets/GroupBox.cpp
dwt/src/widgets/Menu.cpp
dwt/src/widgets/Notification.cpp
dwt/src/widgets/StatusBar.cpp
dwt/src/widgets/TabView.cpp
dwt/src/widgets/TextBox.cpp
dwt/src/widgets/ToolBar.cpp
dwt/src/widgets/ToolTip.cpp
win32/MainWindow.cpp
win32/QueueFrame.cpp
--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk
Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'Compile.txt'
--- Compile.txt 2010-07-10 14:36:48 +0000
+++ Compile.txt 2010-09-02 18:16:12 +0000
@@ -44,7 +44,7 @@
2. Compiler
- a. MinGW (GCC 4.5 or later):
+ a. MinGW (GCC 4.5.1 or later):
<http://sourceforge.net/projects/mingw/files/>
You'll need w32api, binutils, mingw-runtime, gcc-core, gcc-g++, and some deps like libmpc.
=== modified file 'dwt/src/Theme.cpp'
--- dwt/src/Theme.cpp 2010-09-02 13:31:27 +0000
+++ dwt/src/Theme.cpp 2010-09-02 18:16:12 +0000
@@ -92,7 +92,7 @@
if(handleThemeChanges) {
// @todo Is it safe to assume that classes will still point to a valid string?
w->addCallback(Message(WM_THEMECHANGED),
- Dispatchers::VoidVoid<0, false>([this, classes] { this->themeChanged(classes); })); //@todo GCC 4.5.0 workaround
+ Dispatchers::VoidVoid<0, false>([this, classes] { themeChanged(classes); }));
}
}
}
=== modified file 'dwt/src/widgets/Grid.cpp'
--- dwt/src/widgets/Grid.cpp 2010-09-02 13:31:27 +0000
+++ dwt/src/widgets/Grid.cpp 2010-09-02 18:16:12 +0000
@@ -54,7 +54,7 @@
columns[i].align = GridInfo::STRETCH; // Default to stretch for horizontal alignment
}
- onEnabled([this](bool b) { this->handleEnabled(b); }); //@todo GCC 4.5.0 workaround
+ onEnabled([this](bool b) { handleEnabled(b); });
}
Point Grid::getPreferedSize() {
=== modified file 'dwt/src/widgets/GroupBox.cpp'
--- dwt/src/widgets/GroupBox.cpp 2010-09-02 13:31:27 +0000
+++ dwt/src/widgets/GroupBox.cpp 2010-09-02 18:16:12 +0000
@@ -55,7 +55,7 @@
padding.x = ::GetSystemMetrics(SM_CXEDGE) * 2 + cs.padding.x * 2;
padding.y = ::GetSystemMetrics(SM_CYEDGE) + cs.padding.y * 2; // ignore the top border
- onEnabled([this](bool b) { this->handleEnabled(b); }); //@todo GCC 4.5.0 workaround
+ onEnabled([this](bool b) { handleEnabled(b); });
}
Point GroupBox::getPreferedSize() {
=== modified file 'dwt/src/widgets/Menu.cpp'
--- dwt/src/widgets/Menu.cpp 2010-09-02 13:31:27 +0000
+++ dwt/src/widgets/Menu.cpp 2010-09-02 18:16:12 +0000
@@ -223,8 +223,8 @@
}
Control* control = static_cast<Control*>(getParent());
- control->onRaw([this, menuWidth](WPARAM wParam, LPARAM) { return this->handleNCPaint(WM_NCPAINT, wParam, menuWidth); }, Message(WM_NCPAINT)); //@todo GCC 4.5.0 workaround
- control->onRaw([this, menuWidth](WPARAM wParam, LPARAM) { return this->handleNCPaint(WM_NCACTIVATE, wParam, menuWidth); }, Message(WM_NCACTIVATE)); //@todo GCC 4.5.0 workaround
+ control->onRaw([this, menuWidth](WPARAM wParam, LPARAM) { return handleNCPaint(WM_NCPAINT, wParam, menuWidth); }, Message(WM_NCPAINT));
+ control->onRaw([this, menuWidth](WPARAM wParam, LPARAM) { return handleNCPaint(WM_NCACTIVATE, wParam, menuWidth); }, Message(WM_NCACTIVATE));
::DrawMenuBar(control->handle());
}
}
=== modified file 'dwt/src/widgets/Notification.cpp'
--- dwt/src/widgets/Notification.cpp 2010-09-02 13:31:27 +0000
+++ dwt/src/widgets/Notification.cpp 2010-09-02 18:16:12 +0000
@@ -47,8 +47,8 @@
tip = seed.tip;
// TODO Allow more than one icon per window
- parent->setCallback(Message(message), [this](const MSG& msg, LRESULT&) { return this->trayHandler(msg); }); //@todo GCC 4.5.0 workaround
- parent->setCallback(Message(taskbar), [this](const MSG&, LRESULT&) { return this->redisplay(); }); //@todo GCC 4.5.0 workaround
+ parent->setCallback(Message(message), [this](const MSG& msg, LRESULT&) { return trayHandler(msg); });
+ parent->setCallback(Message(taskbar), [this](const MSG&, LRESULT&) { return redisplay(); });
}
void Notification::setIcon(const IconPtr& icon_) {
=== modified file 'dwt/src/widgets/StatusBar.cpp'
--- dwt/src/widgets/StatusBar.cpp 2010-09-02 13:31:27 +0000
+++ dwt/src/widgets/StatusBar.cpp 2010-09-02 18:16:12 +0000
@@ -69,10 +69,10 @@
setFont(cs.font);
tip = WidgetCreator<ToolTip>::create(this, ToolTip::Seed());
- tip->setTool(this, [this](tstring& text) { this->handleToolTip(text); }); //@todo GCC 4.5.0 workaround
+ tip->setTool(this, [this](tstring& text) { handleToolTip(text); });
- ClickType::onClicked([this] { this->handleClicked(); }); //@todo GCC 4.5.0 workaround
- DblClickType::onDblClicked([this] { this->handleDblClicked(); }); //@todo GCC 4.5.0 workaround
+ ClickType::onClicked([this] { handleClicked(); });
+ DblClickType::onDblClicked([this] { handleDblClicked(); });
}
void StatusBar::setSize(unsigned part, unsigned size) {
=== modified file 'dwt/src/widgets/TabView.cpp'
--- dwt/src/widgets/TabView.cpp 2010-09-02 13:31:27 +0000
+++ dwt/src/widgets/TabView.cpp 2010-09-02 18:16:12 +0000
@@ -75,8 +75,8 @@
void TabView::create(const Seed & cs) {
if(cs.ctrlTab) {
- addAccel(FCONTROL, VK_TAB, [this] { this->handleCtrlTab(false); }); //@todo GCC 4.5.0 workaround
- addAccel(FCONTROL | FSHIFT, VK_TAB, [this] { this->handleCtrlTab(true); }); //@todo GCC 4.5.0 workaround
+ addAccel(FCONTROL, VK_TAB, [this] { handleCtrlTab(false); });
+ addAccel(FCONTROL | FSHIFT, VK_TAB, [this] { handleCtrlTab(true); });
}
BaseType::create(cs);
@@ -112,11 +112,11 @@
if(!(cs.style & TCS_BUTTONS)) {
// we don't want pre-drawn borders to get in the way here, so we fully take over painting.
- onPainting([this](PaintCanvas& pc) { this->handlePainting(pc); }); //@todo GCC 4.5.0 workaround
+ onPainting([this](PaintCanvas& pc) { handlePainting(pc); });
}
// TCS_HOTTRACK seems to have no effect in owner-drawn tabs, so do the tracking ourselves.
- onMouseMove([this](const MouseEvent& me) { return this->handleMouseMove(me); }); //@todo GCC 4.5.0 workaround
+ onMouseMove([this](const MouseEvent& me) { return handleMouseMove(me); });
} else {
if(widthConfig <= 3)
@@ -129,17 +129,17 @@
TabCtrl_SetImageList(handle(), imageList->handle());
- onSelectionChanged([this] { this->handleTabSelected(); }); //@todo GCC 4.5.0 workaround
- onLeftMouseDown([this](const MouseEvent& me) { return this->handleLeftMouseDown(me); }); //@todo GCC 4.5.0 workaround
- onLeftMouseUp([this](const MouseEvent& me) { return this->handleLeftMouseUp(me); }); //@todo GCC 4.5.0 workaround
- onContextMenu([this](const ScreenCoordinate& sc) { return this->handleContextMenu(sc); }); //@todo GCC 4.5.0 workaround
- onMiddleMouseDown([this](const MouseEvent& me) { return this->handleMiddleMouseDown(me); }); //@todo GCC 4.5.0 workaround
- onXMouseUp([this](const MouseEvent& me) { return this->handleXMouseUp(me); }); //@todo GCC 4.5.0 workaround
+ onSelectionChanged([this] { handleTabSelected(); });
+ onLeftMouseDown([this](const MouseEvent& me) { return handleLeftMouseDown(me); });
+ onLeftMouseUp([this](const MouseEvent& me) { return handleLeftMouseUp(me); });
+ onContextMenu([this](const ScreenCoordinate& sc) { return handleContextMenu(sc); });
+ onMiddleMouseDown([this](const MouseEvent& me) { return handleMiddleMouseDown(me); });
+ onXMouseUp([this](const MouseEvent& me) { return handleXMouseUp(me); });
if(cs.style & TCS_TOOLTIPS) {
tip = WidgetCreator<ToolTip>::attach(this, TabCtrl_GetToolTips(handle())); // created and managed by the tab control thanks to the TCS_TOOLTIPS style
tip->addRemoveStyle(TTS_NOPREFIX, true);
- tip->onRaw([this](WPARAM, LPARAM lParam) { return this->handleToolTip(lParam); }, Message(WM_NOTIFY, TTN_GETDISPINFO)); //@todo GCC 4.5.0 workaround
+ tip->onRaw([this](WPARAM, LPARAM lParam) { return handleToolTip(lParam); }, Message(WM_NOTIFY, TTN_GETDISPINFO));
}
}
@@ -181,7 +181,7 @@
layout();
- w->onTextChanging([this, w](const tstring& t) { this->handleTextChanging(w, t); }); //@todo GCC 4.5.0 workaround
+ w->onTextChanging([this, w](const tstring& t) { handleTextChanging(w, t); });
}
ContainerPtr TabView::getActive() const {
@@ -588,7 +588,7 @@
if(i != -1 && i != highlighted) {
redraw(i);
highlighted = i;
- onMouseLeave([this]() { this->handleMouseLeave(); }); //@todo GCC 4.5.0 workaround
+ onMouseLeave([this]() { handleMouseLeave(); });
}
if(i != -1 && i == active) {
if(highlightClose ^ inCloseRect(mouseEvent.pos)) {
=== modified file 'dwt/src/widgets/TextBox.cpp'
--- dwt/src/widgets/TextBox.cpp 2010-09-02 13:31:27 +0000
+++ dwt/src/widgets/TextBox.cpp 2010-09-02 18:16:12 +0000
@@ -77,7 +77,7 @@
// multiline text-boxes don't handle ctrl + A so we have do it ourselves...
if((cs.style & ES_MULTILINE) == ES_MULTILINE)
- onKeyDown([this](bool c) { return this->handleKeyDown(c); }); //@todo GCC 4.5.0 workaround
+ onKeyDown([this](bool c) { return handleKeyDown(c); });
}
void TextBox::setText(const tstring& txt) {
=== modified file 'dwt/src/widgets/ToolBar.cpp'
--- dwt/src/widgets/ToolBar.cpp 2010-09-02 13:31:27 +0000
+++ dwt/src/widgets/ToolBar.cpp 2010-09-02 18:16:12 +0000
@@ -59,20 +59,20 @@
//// Telling the toolbar what the size of the TBBUTTON struct is
sendMessage(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON));
- onRaw([this](WPARAM, LPARAM lParam) { return this->handleDropDown(lParam); }, Message(WM_NOTIFY, TBN_DROPDOWN)); //@todo GCC 4.5.0 workaround
- onRaw([this](WPARAM, LPARAM lParam) { return this->handleToolTip(lParam); }, Message(WM_NOTIFY, TBN_GETINFOTIP)); //@todo GCC 4.5.0 workaround
+ onRaw([this](WPARAM, LPARAM lParam) { return handleDropDown(lParam); }, Message(WM_NOTIFY, TBN_DROPDOWN));
+ onRaw([this](WPARAM, LPARAM lParam) { return handleToolTip(lParam); }, Message(WM_NOTIFY, TBN_GETINFOTIP));
if((cs.style & CCS_ADJUSTABLE) == CCS_ADJUSTABLE) {
// customization-related messages
- onRaw([this](WPARAM, LPARAM) { return this->handleBeginAdjust(); }, Message(WM_NOTIFY, TBN_BEGINADJUST)); //@todo GCC 4.5.0 workaround
- onRaw([this](WPARAM, LPARAM) { return this->handleChange(); }, Message(WM_NOTIFY, TBN_TOOLBARCHANGE)); //@todo GCC 4.5.0 workaround
- onRaw([this](WPARAM, LPARAM) { return this->handleCustHelp(); }, Message(WM_NOTIFY, TBN_CUSTHELP)); //@todo GCC 4.5.0 workaround
- onRaw([this](WPARAM, LPARAM) { return this->handleEndAdjust(); }, Message(WM_NOTIFY, TBN_ENDADJUST)); //@todo GCC 4.5.0 workaround
- onRaw([this](WPARAM, LPARAM lParam) { return this->handleGetButtonInfo(lParam); }, Message(WM_NOTIFY, TBN_GETBUTTONINFO)); //@todo GCC 4.5.0 workaround
- onRaw([this](WPARAM, LPARAM) { return this->handleInitCustomize(); }, Message(WM_NOTIFY, TBN_INITCUSTOMIZE)); //@todo GCC 4.5.0 workaround
- onRaw([this](WPARAM, LPARAM) { return this->handleQuery(); }, Message(WM_NOTIFY, TBN_QUERYINSERT)); //@todo GCC 4.5.0 workaround
- onRaw([this](WPARAM, LPARAM) { return this->handleQuery(); }, Message(WM_NOTIFY, TBN_QUERYDELETE)); //@todo GCC 4.5.0 workaround
- onRaw([this](WPARAM, LPARAM) { return this->handleReset(); }, Message(WM_NOTIFY, TBN_RESET)); //@todo GCC 4.5.0 workaround
+ onRaw([this](WPARAM, LPARAM) { return handleBeginAdjust(); }, Message(WM_NOTIFY, TBN_BEGINADJUST));
+ onRaw([this](WPARAM, LPARAM) { return handleChange(); }, Message(WM_NOTIFY, TBN_TOOLBARCHANGE));
+ onRaw([this](WPARAM, LPARAM) { return handleCustHelp(); }, Message(WM_NOTIFY, TBN_CUSTHELP));
+ onRaw([this](WPARAM, LPARAM) { return handleEndAdjust(); }, Message(WM_NOTIFY, TBN_ENDADJUST));
+ onRaw([this](WPARAM, LPARAM lParam) { return handleGetButtonInfo(lParam); }, Message(WM_NOTIFY, TBN_GETBUTTONINFO));
+ onRaw([this](WPARAM, LPARAM) { return handleInitCustomize(); }, Message(WM_NOTIFY, TBN_INITCUSTOMIZE));
+ onRaw([this](WPARAM, LPARAM) { return handleQuery(); }, Message(WM_NOTIFY, TBN_QUERYINSERT));
+ onRaw([this](WPARAM, LPARAM) { return handleQuery(); }, Message(WM_NOTIFY, TBN_QUERYDELETE));
+ onRaw([this](WPARAM, LPARAM) { return handleReset(); }, Message(WM_NOTIFY, TBN_RESET));
}
}
=== modified file 'dwt/src/widgets/ToolTip.cpp'
--- dwt/src/widgets/ToolTip.cpp 2010-09-02 13:31:27 +0000
+++ dwt/src/widgets/ToolTip.cpp 2010-09-02 18:16:12 +0000
@@ -57,7 +57,7 @@
void ToolTip::setText(Widget* widget, const tstring& text_) {
text = text_;
- setTool(widget, [this](tstring& t) { this->handleGetTip(t); }); //@todo GCC 4.5.0 workaround
+ setTool(widget, [this](tstring& t) { handleGetTip(t); });
}
void ToolTip::setTool(Widget* widget, const Dispatcher::F& f) {
=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp 2010-09-02 13:31:27 +0000
+++ win32/MainWindow.cpp 2010-09-02 18:16:12 +0000
@@ -183,10 +183,10 @@
}
if(!systemLogOpen)
- SystemFrame::openWindow(this->getTabView()); //@todo GCC 4.5.0 workaround
+ SystemFrame::openWindow(getTabView());
WinUtil::help(this, IDH_GET_STARTED);
- this->handleSettings(); //@todo GCC 4.5.0 workaround
+ handleSettings();
});
}
=== modified file 'win32/QueueFrame.cpp'
--- win32/QueueFrame.cpp 2010-09-02 13:31:27 +0000
+++ win32/QueueFrame.cpp 2010-09-02 18:16:12 +0000
@@ -103,7 +103,7 @@
status->setHelpId(STATUS_TOTAL_COUNT, IDH_QUEUE_TOTAL_COUNT);
status->setHelpId(STATUS_TOTAL_BYTES, IDH_QUEUE_TOTAL_BYTES);
- QueueManager::getInstance()->addListener(this, [this](const QueueItem::StringMap& qsm) { this->addQueueList(qsm); }); //@todo GCC 4.5.0 workaround
+ QueueManager::getInstance()->addListener(this, [this](const QueueItem::StringMap& qsm) { addQueueList(qsm); });
updateStatus();
