linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 22
committer: poy <poy@xxxxxxxxxx>
branch nick: SpellPlugin
timestamp: Sun 2013-05-05 15:55:27 +0200
message:
  dwt update & box scrolling
modified:
  dwt/src/Dispatcher.cpp
  projects/make/Makefile
  src/GUI.cpp


--
lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/SpellPlugin
https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/SpellPlugin

Your team Dcplusplus-team is subscribed to branch lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/SpellPlugin.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/SpellPlugin/+edit-subscription

=== modified file 'dwt/src/Dispatcher.cpp'
--- dwt/src/Dispatcher.cpp	2013-04-29 18:55:17 +0000
+++ dwt/src/Dispatcher.cpp	2013-05-05 13:55:27 +0000
@@ -37,6 +37,12 @@
 #include <algorithm>
 #include <sstream>
 
+#ifdef DWT_SHARED
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/random_generator.hpp>
+#include <boost/uuid/uuid_io.hpp>
+#endif
+
 namespace dwt {
 
 LRESULT CALLBACK WindowProc::initProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
@@ -222,8 +228,12 @@
 
 #ifdef DWT_SHARED
 	/* in a shared library, classes registered by the lib can't clash with those regged by the host
-	or by other dynamically loaded libs. append a (hopefully unique) string to that end... */
-	stream << &Application::instance();
+	or by other dynamically loaded libs. append a unique string to that end. */
+	static boost::uuids::uuid uuid;
+	if(uuid.is_nil()) {
+		uuid = boost::uuids::random_generator()();
+	}
+	stream << uuid;
 #endif
 
 	classNames.push_back(stream.str());

=== modified file 'projects/make/Makefile'
--- projects/make/Makefile	2013-04-29 18:55:39 +0000
+++ projects/make/Makefile	2013-05-05 13:55:27 +0000
@@ -132,7 +132,6 @@
 $(OUTPUT_DIR):
 	$(call MKDIR,$(OUTPUT_DIR)/pluginsdk)
 	$(call MKDIR,$(OUTPUT_DIR)/src)
-	$(call MKDIR,$(OUTPUT_DIR)/boost/libs/regex/src)
 	$(call MKDIR,$(OUTPUT_DIR)/dwt/src/util/win32)
 	$(call MKDIR,$(OUTPUT_DIR)/dwt/src/widgets)
 	$(call MKDIR,$(OUTPUT_DIR)/hunspell)

=== modified file 'src/GUI.cpp'
--- src/GUI.cpp	2013-04-29 19:39:43 +0000
+++ src/GUI.cpp	2013-05-05 13:55:27 +0000
@@ -95,7 +95,9 @@
 		cur->column(0).mode = GridInfo::FILL;
 		cur->setSpacing(grid->getSpacing());
 
-		affBox = cur->addChild(TextBox::Seed(Util::toT(Config::getConfig("AffPath"))));
+		TextBox::Seed ts(Util::toT(Config::getConfig("AffPath")));
+		ts.style |= ES_AUTOHSCROLL;
+		affBox = cur->addChild(ts);
 
 		cur->addChild(Button::Seed(_T("Browse")))->onClicked([] {
 			auto s = affBox->getText();
@@ -110,7 +112,9 @@
 		cur->column(0).mode = GridInfo::FILL;
 		cur->setSpacing(grid->getSpacing());
 
-		dicBox = cur->addChild(TextBox::Seed(Util::toT(Config::getConfig("DicPath"))));
+		TextBox::Seed ts(Util::toT(Config::getConfig("DicPath")));
+		ts.style |= ES_AUTOHSCROLL;
+		dicBox = cur->addChild(ts);
 
 		cur->addChild(Button::Seed(_T("Browse")))->onClicked([] {
 			auto s = dicBox->getText();