linuxdcpp-team team mailing list archive

Thread
Date

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2428: reduce the amount of headers in the pch

To: LinuxDC++ Team <linuxdcpp-team@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Sat, 19 Feb 2011 17:05:48 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 2428
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sat 2011-02-19 18:03:15 +0100
message:
  reduce the amount of headers in the pch
modified:
  dcpp/MappingManager.cpp
  dwt/include/dwt/forward.h
  dwt/include/dwt/resources/Bitmap.h
  dwt/include/dwt/resources/Brush.h
  dwt/include/dwt/resources/Font.h
  dwt/include/dwt/resources/Icon.h
  dwt/include/dwt/resources/ImageList.h
  dwt/include/dwt/resources/Pen.h
  dwt/include/dwt/resources/Region.h
  win32/Appearance2Page.cpp
  win32/AppearancePage.cpp
  win32/DirectoryListingFrame.cpp
  win32/FavoriteDirsPage.cpp
  win32/HubFrame.cpp
  win32/MainWindow.cpp
  win32/PropPage.cpp
  win32/QueueFrame.cpp
  win32/SearchFrame.cpp
  win32/StatsFrame.cpp
  win32/TransferView.cpp
  win32/UploadPage.cpp
  win32/UsersFrame.cpp
  win32/WinUtil.cpp
  win32/WinUtil.h
  win32/main.cpp
  win32/stdafx.h


--
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 'dcpp/MappingManager.cpp'
--- dcpp/MappingManager.cpp	2011-02-12 15:11:02 +0000
+++ dcpp/MappingManager.cpp	2011-02-19 17:03:15 +0000
@@ -118,8 +118,8 @@
 			if(port && !mapper.open(port, protocol, boost::str(F_("%1% %2% port (%3% %4%)") %
 				APPNAME % description % port % Mapper::protocols[protocol])))
 			{
-				this->log(boost::str(F_("The %1% interface has failed to map the %2% port (%3% %4%)") %
-					mapper.getName() % description % port % Mapper::protocols[protocol]));
+				this->log(boost::str(F_("Failed to map the %1% port (%2% %3%) with the %4% interface") %
+					description % port % Mapper::protocols[protocol] % mapper.getName()));
 				mapper.close();
 				return false;
 			}

=== modified file 'dwt/include/dwt/forward.h'
--- dwt/include/dwt/forward.h	2011-01-27 23:11:24 +0000
+++ dwt/include/dwt/forward.h	2011-02-19 17:03:15 +0000
@@ -33,17 +33,29 @@
 #ifndef DWT_FORWARD_H_
 #define DWT_FORWARD_H_
 
+namespace boost {
+template<class T> class intrusive_ptr;
+}
+
 namespace dwt {
 
 template< class WidgetType >
 class WidgetCreator;
 
+class Bitmap;
+typedef boost::intrusive_ptr<Bitmap> BitmapPtr;
+
+class Brush;
+typedef boost::intrusive_ptr<Brush> BrushPtr;
+
 class Button;
 typedef Button* ButtonPtr;
 
 class CheckBox;
 typedef CheckBox* CheckBoxPtr;
 
+class ColorDialog;
+
 class ComboBox;
 typedef ComboBox* ComboBoxPtr;
 
@@ -56,6 +68,13 @@
 class DateTime;
 typedef DateTime* DateTimePtr;
 
+class FolderDialog;
+
+class Font;
+typedef boost::intrusive_ptr<Font> FontPtr;
+
+class FontDialog;
+
 class Grid;
 typedef Grid* GridPtr;
 class GridInfo;
@@ -63,9 +82,17 @@
 class GroupBox;
 typedef GroupBox* GroupBoxPtr;
 
+class Icon;
+typedef boost::intrusive_ptr<Icon> IconPtr;
+
+class ImageList;
+typedef boost::intrusive_ptr<ImageList> ImageListPtr;
+
 class Label;
 typedef Label* LabelPtr;
 
+class LoadDialog;
+
 class Menu;
 typedef shared_ptr<Menu> MenuPtr;
 
@@ -81,6 +108,11 @@
 class Notification;
 typedef shared_ptr<Notification> NotificationPtr;
 
+class Pen;
+typedef boost::intrusive_ptr<Pen> PenPtr;
+
+struct Point;
+
 class ProgressBar;
 typedef ProgressBar* ProgressBarPtr;
 
@@ -90,9 +122,16 @@
 class Rebar;
 typedef Rebar* RebarPtr;
 
+struct Rectangle;
+
+class Region;
+typedef boost::intrusive_ptr<Region> RegionPtr;
+
 class RichTextBox;
 typedef RichTextBox* RichTextBoxPtr;
 
+class SaveDialog;
+
 class Slider;
 typedef Slider* SliderPtr;
 

=== modified file 'dwt/include/dwt/resources/Bitmap.h'
--- dwt/include/dwt/resources/Bitmap.h	2011-01-02 17:12:02 +0000
+++ dwt/include/dwt/resources/Bitmap.h	2011-02-19 17:03:15 +0000
@@ -37,21 +37,12 @@
 #define DWT_Bitmap_h
 
 #include "../WindowsHeaders.h"
+#include "../forward.h"
 #include "../tstring.h"
 #include "Handle.h"
 
 namespace dwt {
 
-// Forward declarations
-class Bitmap;
-struct Point;
-
-/// \ingroup GlobalStuff
-/// Bitmap pointer
-/** Use this typedef instead to ensure compatibility in future versions of SmartWin!!
-  */
-typedef boost::intrusive_ptr< Bitmap > BitmapPtr;
-
 /// Class encapsulating an HBITMAP and ensuring that the contained HBITMAP is freed
 /// upon destruction of this object
 /** Use this class if you need RAII semantics encapsulating an HBITMAP

=== modified file 'dwt/include/dwt/resources/Brush.h'
--- dwt/include/dwt/resources/Brush.h	2011-01-02 17:12:02 +0000
+++ dwt/include/dwt/resources/Brush.h	2011-02-19 17:03:15 +0000
@@ -37,14 +37,11 @@
 #define DWT_BRUSH_H_
 
 #include "../WindowsHeaders.h"
+#include "../forward.h"
 #include "Handle.h"
 
 namespace dwt {
 
-class Brush;
-
-typedef boost::intrusive_ptr< Brush > BrushPtr;
-
 class Brush : public Handle<GdiPolicy<HBRUSH> > {
 public:
 	enum SysColor

=== modified file 'dwt/include/dwt/resources/Font.h'
--- dwt/include/dwt/resources/Font.h	2011-01-02 17:12:02 +0000
+++ dwt/include/dwt/resources/Font.h	2011-02-19 17:03:15 +0000
@@ -37,14 +37,12 @@
 #define DWT_Font_h
 
 #include "../WindowsHeaders.h"
+#include "../forward.h"
 #include "../tstring.h"
 #include "Handle.h"
 
 namespace dwt {
 
-class Font;
-typedef boost::intrusive_ptr< Font > FontPtr;
-
 #ifndef WINCE
 /// Type of default installed fonts you can create with the Font class
 /** If you want to use one of the default fonts from windows you can use this enum

=== modified file 'dwt/include/dwt/resources/Icon.h'
--- dwt/include/dwt/resources/Icon.h	2011-01-02 17:12:02 +0000
+++ dwt/include/dwt/resources/Icon.h	2011-02-19 17:03:15 +0000
@@ -37,21 +37,13 @@
 #define DWT_Icon_h
 
 #include "../WindowsHeaders.h"
+#include "../forward.h"
 #include "../Point.h"
 #include "../tstring.h"
 #include "Handle.h"
 
 namespace dwt {
 
-// Forward declaration
-class Icon;
-
-/// \ingroup GlobalStuff
-/// Icon pointer
-/** Use this typedef instead to ensure compatibility in future versions of SmartWin!!
-  */
-typedef boost::intrusive_ptr< Icon > IconPtr;
-
 struct IconPolicy : public NullPolicy<HICON> {
 	void release(HICON h) { ::DestroyIcon(h); }
 };

=== modified file 'dwt/include/dwt/resources/ImageList.h'
--- dwt/include/dwt/resources/ImageList.h	2011-01-05 20:22:31 +0000
+++ dwt/include/dwt/resources/ImageList.h	2011-02-19 17:03:15 +0000
@@ -37,6 +37,7 @@
 #define DWT_ImageList_h
 
 #include "../WindowsHeaders.h"
+#include "../forward.h"
 #include "../tstring.h"
 #include "../Point.h"
 #include "Bitmap.h"
@@ -45,15 +46,6 @@
 
 namespace dwt {
 
-// Forward declaration
-class ImageList;
-
-/// \ingroup GlobalStuff
-/// ImageList pointer
-/** Use this typedef instead to ensure compatibility in future versions of SmartWin!!
-  */
-typedef boost::intrusive_ptr< ImageList > ImageListPtr;
-
 /// Class encapsulating an HIMAGELIST and ensuring that the contained HIMAGELIST is
 /// freed upon destruction of this object
 /** Use this class if you need RAII semantics encapsulating an HIMAGELIST. <br>

=== modified file 'dwt/include/dwt/resources/Pen.h'
--- dwt/include/dwt/resources/Pen.h	2011-01-02 17:12:02 +0000
+++ dwt/include/dwt/resources/Pen.h	2011-02-19 17:03:15 +0000
@@ -37,14 +37,11 @@
 #define DWT_PEN_H_
 
 #include "../WindowsHeaders.h"
+#include "../forward.h"
 #include "Handle.h"
 
 namespace dwt {
 
-class Pen;
-
-typedef boost::intrusive_ptr< Pen > PenPtr;
-
 class Pen : public Handle<GdiPolicy<HPEN> > {
 public:
 	enum PenStyle {

=== modified file 'dwt/include/dwt/resources/Region.h'
--- dwt/include/dwt/resources/Region.h	2011-01-27 22:57:05 +0000
+++ dwt/include/dwt/resources/Region.h	2011-02-19 17:03:15 +0000
@@ -33,18 +33,12 @@
 #define DWT_REGION_H
 
 #include "../WindowsHeaders.h"
+#include "../forward.h"
 #include "Handle.h"
 #include <dwt/Rectangle.h>
 
-#include <vector>
-
 namespace dwt {
 
-struct Point;
-class Region;
-
-typedef boost::intrusive_ptr<Region> RegionPtr;
-
 class Region : public Handle<GdiPolicy<HRGN> > {
 public:
 	/**

=== modified file 'win32/Appearance2Page.cpp'
--- win32/Appearance2Page.cpp	2011-01-30 16:17:57 +0000
+++ win32/Appearance2Page.cpp	2011-02-19 17:03:15 +0000
@@ -22,6 +22,10 @@
 
 #include "Appearance2Page.h"
 
+#include <dwt/widgets/ColorDialog.h>
+#include <dwt/widgets/FontDialog.h>
+#include <dwt/widgets/LoadDialog.h>
+
 #include <dcpp/SettingsManager.h>
 #include "WinUtil.h"
 

=== modified file 'win32/AppearancePage.cpp'
--- win32/AppearancePage.cpp	2011-01-02 17:12:02 +0000
+++ win32/AppearancePage.cpp	2011-02-19 17:03:15 +0000
@@ -22,6 +22,7 @@
 
 #include "AppearancePage.h"
 
+#include <dwt/widgets/LoadDialog.h>
 #include <dwt/widgets/Spinner.h>
 
 #include <dcpp/SettingsManager.h>

=== modified file 'win32/DirectoryListingFrame.cpp'
--- win32/DirectoryListingFrame.cpp	2011-01-30 13:28:11 +0000
+++ win32/DirectoryListingFrame.cpp	2011-02-19 17:03:15 +0000
@@ -35,7 +35,10 @@
 #include <dcpp/ShareManager.h>
 #include <dcpp/WindowInfo.h>
 
+#include <dwt/widgets/FolderDialog.h>
 #include <dwt/widgets/Rebar.h>
+#include <dwt/widgets/SaveDialog.h>
+#include <dwt/widgets/Splitter.h>
 #include <dwt/widgets/ToolBar.h>
 
 const string DirectoryListingFrame::id = "DirectoryListing";
@@ -232,8 +235,7 @@
 		WinUtil::makeColumns(files, filesColumns, COLUMN_LAST, SETTING(DIRECTORYLISTINGFRAME_ORDER), SETTING(DIRECTORYLISTINGFRAME_WIDTHS));
 		files->setSort(COLUMN_FILENAME);
 
-		files->onSelectionChanged(std::bind(&DirectoryListingFrame::callAsync, this,
-			dwt::Application::Callback(std::bind(&DirectoryListingFrame::updateStatus, this))));
+		files->onSelectionChanged([this] { GCC_WTF->callAsync([&] { updateStatus(); }); });
 		files->onDblClicked(std::bind(&DirectoryListingFrame::handleDoubleClickFiles, this));
 		files->onKeyDown(std::bind(&DirectoryListingFrame::handleKeyDownFiles, this, _1));
 		files->onSysKeyDown(std::bind(&DirectoryListingFrame::handleKeyDownFiles, this, _1));

=== modified file 'win32/FavoriteDirsPage.cpp'
--- win32/FavoriteDirsPage.cpp	2011-01-02 17:12:02 +0000
+++ win32/FavoriteDirsPage.cpp	2011-02-19 17:03:15 +0000
@@ -22,6 +22,8 @@
 
 #include "FavoriteDirsPage.h"
 
+#include <dwt/widgets/FolderDialog.h>
+
 #include <dcpp/SettingsManager.h>
 #include <dcpp/FavoriteManager.h>
 #include <dcpp/version.h>

=== modified file 'win32/HubFrame.cpp'
--- win32/HubFrame.cpp	2011-02-02 17:45:47 +0000
+++ win32/HubFrame.cpp	2011-02-19 17:03:15 +0000
@@ -36,6 +36,8 @@
 #include <dcpp/version.h>
 #include <dcpp/WindowInfo.h>
 
+#include <dwt/widgets/Splitter.h>
+
 const string HubFrame::id = WindowManager::hub();
 const string& HubFrame::getId() const { return id; }
 
@@ -161,8 +163,7 @@
 		WinUtil::makeColumns(users, usersColumns, COLUMN_LAST, SETTING(HUBFRAME_ORDER), SETTING(HUBFRAME_WIDTHS));
 		users->setSort(COLUMN_NICK);
 
-		users->onSelectionChanged(std::bind(&HubFrame::callAsync, this,
-			dwt::Application::Callback(std::bind(&HubFrame::updateStatus, this))));
+		users->onSelectionChanged([this] { GCC_WTF->callAsync([&] { updateStatus(); }); });
 		users->onDblClicked(std::bind(&HubFrame::handleDoubleClickUsers, this));
 		users->onKeyDown(std::bind(&HubFrame::handleUsersKeyDown, this, _1));
 		users->onContextMenu(std::bind(&HubFrame::handleUsersContextMenu, this, _1));
@@ -369,7 +370,7 @@
 				addStatus(T_("Join/part of favorite users showing off"));
 			}
 		} else if(Util::stricmp(cmd.c_str(), _T("close")) == 0) {
-			this->close(true);
+			close(true);
 		} else if(Util::stricmp(cmd.c_str(), _T("userlist")) == 0) {
 			showUsers->setChecked(!showUsers->getChecked());
 		} else if(Util::stricmp(cmd.c_str(), _T("connection")) == 0) {
@@ -771,7 +772,7 @@
 void HubFrame::on(Connecting, Client*) throw() {
 	tstring hubUrl = Text::toT(client->getHubUrl());
 	callAsync([this, hubUrl]() { addStatus(boost::str(TF_("Connecting to %1%...") % hubUrl), true); });
-	callAsync([this, hubUrl]() { this->setText(hubUrl); });
+	callAsync([this, hubUrl]() { GCC_WTF->setText(hubUrl); });
 }
 void HubFrame::on(Connected, Client*) throw() {
 	callAsync(std::bind(&HubFrame::onConnected, this));
@@ -825,7 +826,7 @@
 	}
 #endif
 	tstring hubNameT = Text::toT(hubName);
-	callAsync([this, hubNameT]() { this->setText(hubNameT); });
+	callAsync([this, hubNameT]() { GCC_WTF->setText(hubNameT); });
 }
 
 void HubFrame::on(Message, Client*, const ChatMessage& message) throw() {

=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp	2011-02-02 17:45:47 +0000
+++ win32/MainWindow.cpp	2011-02-19 17:03:15 +0000
@@ -66,9 +66,11 @@
 #include <dcpp/SimpleXML.h>
 #include <dcpp/ThrottleManager.h>
 
+#include <dwt/Application.h>
 #include <dwt/widgets/Notification.h>
 #include <dwt/widgets/Rebar.h>
 #include <dwt/widgets/Spinner.h>
+#include <dwt/widgets/Splitter.h>
 #include <dwt/widgets/ToolBar.h>
 
 #ifdef HAVE_HTMLHELP_H

=== modified file 'win32/PropPage.cpp'
--- win32/PropPage.cpp	2011-01-30 16:17:57 +0000
+++ win32/PropPage.cpp	2011-02-19 17:03:15 +0000
@@ -22,6 +22,9 @@
 
 #include "PropPage.h"
 
+#include <dwt/widgets/FolderDialog.h>
+#include <dwt/widgets/LoadDialog.h>
+
 #include <dcpp/SettingsManager.h>
 #include "WinUtil.h"
 

=== modified file 'win32/QueueFrame.cpp'
--- win32/QueueFrame.cpp	2011-01-30 13:28:11 +0000
+++ win32/QueueFrame.cpp	2011-02-19 17:03:15 +0000
@@ -19,6 +19,7 @@
 #include "stdafx.h"
 
 #include "QueueFrame.h"
+
 #include "WinUtil.h"
 #include "resource.h"
 #include "HoldRedraw.h"
@@ -27,6 +28,9 @@
 #include <dcpp/QueueManager.h>
 #include <dcpp/version.h>
 
+#include <dwt/widgets/FolderDialog.h>
+#include <dwt/widgets/Splitter.h>
+
 const string QueueFrame::id = "Queue";
 const string& QueueFrame::getId() const { return id; }
 
@@ -83,8 +87,7 @@
 		files->setSort(COLUMN_TARGET);
 
 		files->onKeyDown(std::bind(&QueueFrame::handleKeyDownFiles, this, _1));
-		files->onSelectionChanged(std::bind(&QueueFrame::callAsync, this,
-			dwt::Application::Callback(std::bind(&QueueFrame::updateStatus, this))));
+		files->onSelectionChanged([this] { GCC_WTF->callAsync([&] { updateStatus(); }); });
 		files->onContextMenu(std::bind(&QueueFrame::handleFilesContextMenu, this, _1));
 	}
 

=== modified file 'win32/SearchFrame.cpp'
--- win32/SearchFrame.cpp	2011-02-11 21:36:28 +0000
+++ win32/SearchFrame.cpp	2011-02-19 17:03:15 +0000
@@ -25,7 +25,9 @@
 #include <dcpp/QueueManager.h>
 #include <dcpp/ClientManager.h>
 #include <dcpp/ShareManager.h>
-#include <set>
+
+#include <dwt/widgets/FolderDialog.h>
+#include <dwt/widgets/Splitter.h>
 
 const string SearchFrame::id = "Search";
 const string& SearchFrame::getId() const { return id; }

=== modified file 'win32/StatsFrame.cpp'
--- win32/StatsFrame.cpp	2011-01-27 22:57:05 +0000
+++ win32/StatsFrame.cpp	2011-02-19 17:03:15 +0000
@@ -23,6 +23,8 @@
 #include <dcpp/Socket.h>
 #include <dcpp/TimerManager.h>
 
+#include <dwt/resources/Pen.h>
+
 const string StatsFrame::id = "Stats";
 const string& StatsFrame::getId() const { return id; }
 

=== modified file 'win32/TransferView.cpp'
--- win32/TransferView.cpp	2011-01-30 13:28:11 +0000
+++ win32/TransferView.cpp	2011-02-19 17:03:15 +0000
@@ -32,6 +32,8 @@
 #include <dcpp/Download.h>
 #include <dcpp/Upload.h>
 
+#include <dwt/resources/Pen.h>
+
 #include <boost/scoped_ptr.hpp>
 
 int TransferView::connectionIndexes[] = { CONNECTION_COLUMN_USER, CONNECTION_COLUMN_HUB, CONNECTION_COLUMN_STATUS, CONNECTION_COLUMN_SPEED, CONNECTION_COLUMN_CHUNK, CONNECTION_COLUMN_TRANSFERED, CONNECTION_COLUMN_QUEUED, CONNECTION_COLUMN_CIPHER, CONNECTION_COLUMN_IP, CONNECTION_COLUMN_COUNTRY };

=== modified file 'win32/UploadPage.cpp'
--- win32/UploadPage.cpp	2011-01-02 17:12:02 +0000
+++ win32/UploadPage.cpp	2011-02-19 17:03:15 +0000
@@ -22,6 +22,7 @@
 
 #include "UploadPage.h"
 
+#include <dwt/widgets/FolderDialog.h>
 #include <dwt/widgets/Spinner.h>
 
 #include <dcpp/SettingsManager.h>

=== modified file 'win32/UsersFrame.cpp'
--- win32/UsersFrame.cpp	2011-02-19 15:32:03 +0000
+++ win32/UsersFrame.cpp	2011-02-19 17:03:15 +0000
@@ -27,6 +27,8 @@
 #include <dcpp/QueueManager.h>
 #include <dcpp/version.h>
 
+#include <dwt/widgets/Splitter.h>
+
 const string UsersFrame::id = "Users";
 const string& UsersFrame::getId() const { return id; }
 

=== modified file 'win32/WinUtil.cpp'
--- win32/WinUtil.cpp	2011-02-12 20:30:05 +0000
+++ win32/WinUtil.cpp	2011-02-19 17:03:15 +0000
@@ -47,6 +47,8 @@
 #include <dwt/DWTException.h>
 #include <dwt/LibraryLoader.h>
 #include <dwt/util/GDI.h>
+#include <dwt/widgets/LoadDialog.h>
+#include <dwt/widgets/SaveDialog.h>
 
 #ifdef HAVE_HTMLHELP_H
 #include <htmlhelp.h>
@@ -970,8 +972,7 @@
 	}
 }
 
-pair<ButtonPtr, ButtonPtr> WinUtil::addDlgButtons(GridPtr grid, const dwt::Application::Callback& f_ok,
-	const dwt::Application::Callback& f_cancel)
+pair<ButtonPtr, ButtonPtr> WinUtil::addDlgButtons(GridPtr grid)
 {
 	Button::Seed seed;
 
@@ -981,7 +982,6 @@
 	ButtonPtr ok = grid->addChild(seed);
 	ok->setHelpId(IDH_DCPP_OK);
 	ok->setImage(buttonIcon(IDI_OK));
-	ok->onClicked(f_ok);
 
 	seed.caption = T_("Cancel");
 	seed.menuHandle = reinterpret_cast<HMENU> (IDCANCEL);
@@ -989,7 +989,6 @@
 	ButtonPtr cancel = grid->addChild(seed);
 	cancel->setHelpId(IDH_DCPP_CANCEL);
 	cancel->setImage(buttonIcon(IDI_CANCEL));
-	cancel->onClicked(f_cancel);
 
 	return make_pair(ok, cancel);
 }

=== modified file 'win32/WinUtil.h'
--- win32/WinUtil.h	2011-01-29 14:15:43 +0000
+++ win32/WinUtil.h	2011-02-19 17:03:15 +0000
@@ -171,10 +171,17 @@
 		return ret;
 	}
 
-	static pair<ButtonPtr, ButtonPtr> addDlgButtons(
-		GridPtr grid,
-		const dwt::Application::Callback& f_ok,
-		const dwt::Application::Callback& f_cancel);
+private:
+	static pair<ButtonPtr, ButtonPtr> addDlgButtons(GridPtr grid);
+public:
+	/// @return pair of the ok and cancel buttons.
+	template<typename Tok, typename Tcancel>
+	static pair<ButtonPtr, ButtonPtr> addDlgButtons(GridPtr grid, const Tok& f_ok, const Tcancel& f_cancel) {
+		auto ret = addDlgButtons(grid);
+		ret.first->onClicked(f_ok);
+		ret.second->onClicked(f_cancel);
+		return ret;
+	}
 
 	static size_t getFileIcon(const tstring& aFileName);
 

=== modified file 'win32/main.cpp'
--- win32/main.cpp	2011-02-11 23:08:25 +0000
+++ win32/main.cpp	2011-02-19 17:03:15 +0000
@@ -32,6 +32,8 @@
 #include <dcpp/MappingManager.h>
 #include <dcpp/ResourceManager.h>
 
+#include <dwt/Application.h>
+
 #define WMU_WHERE_ARE_YOU_MSG _T("WMU_WHERE_ARE_YOU-{885D4B75-6606-4add-A8DE-EEEDC04181F1}")
 
 const UINT SingleInstance::WMU_WHERE_ARE_YOU = ::RegisterWindowMessage(WMU_WHERE_ARE_YOU_MSG);

=== modified file 'win32/stdafx.h'
--- win32/stdafx.h	2011-01-27 23:11:24 +0000
+++ win32/stdafx.h	2011-02-19 17:03:15 +0000
@@ -24,39 +24,31 @@
 #include <dcpp/stdinc.h>
 #include <dcpp/DCPlusPlus.h>
 
+using namespace dcpp;
+
 #include <libintl.h>
 
-#include <dwt/Application.h>
-#include <dwt/resources/Pen.h>
+#include <dwt/forward.h>
 #include <dwt/util/StringUtils.h>
 #include <dwt/widgets/Button.h>
 #include <dwt/widgets/CheckBox.h>
 #include <dwt/widgets/ComboBox.h>
-#include <dwt/widgets/ColorDialog.h>
 #include <dwt/widgets/Container.h>
-#include <dwt/widgets/FolderDialog.h>
-#include <dwt/widgets/FontDialog.h>
 #include <dwt/widgets/Grid.h>
 #include <dwt/widgets/GroupBox.h>
 #include <dwt/widgets/Label.h>
-#include <dwt/widgets/LoadDialog.h>
 #include <dwt/widgets/MessageBox.h>
 #include <dwt/widgets/Menu.h>
 #include <dwt/widgets/ModalDialog.h>
 #include <dwt/widgets/ModelessDialog.h>
 #include <dwt/widgets/RadioButton.h>
 #include <dwt/widgets/RichTextBox.h>
-#include <dwt/widgets/SaveDialog.h>
-#include <dwt/widgets/Splitter.h>
 #include <dwt/widgets/Table.h>
 #include <dwt/widgets/TabView.h>
 #include <dwt/widgets/TextBox.h>
 #include <dwt/widgets/Tree.h>
-#include <dwt/widgets/ToolTip.h>
 #include <dwt/widgets/Window.h>
 
-using namespace dcpp;
-
 using dwt::util::escapeMenu;
 using dwt::Button;
 using dwt::ButtonPtr;