[Scummvm-cvs-logs] SF.net SVN: scummvm: [28645] tools/branches/gsoc2007-toolsgui

[knakos at users.sourceforge.net]

Revision: 28645
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28645&view=rev
Author:   knakos
Date:     2007-08-17 03:10:57 -0700 (Fri, 17 Aug 2007)

Log Message:
-----------
add compatibility with (at least) wx 2.6

Modified Paths:
--------------
    tools/branches/gsoc2007-toolsgui/tools_gui.cpp
    tools/branches/gsoc2007-toolsgui/tools_gui.h

Modified: tools/branches/gsoc2007-toolsgui/tools_gui.cpp
===================================================================
--- tools/branches/gsoc2007-toolsgui/tools_gui.cpp	2007-08-17 08:49:55 UTC (rev 28644)
+++ tools/branches/gsoc2007-toolsgui/tools_gui.cpp	2007-08-17 10:10:57 UTC (rev 28645)
@@ -103,7 +103,7 @@
 			wxArrayString filenames;
 			dialog->GetPaths(filenames);
 
-			if (!this->_target->IsEmpty()) {
+			if (!this->_target->GetValue().empty()) {
 				this->_target->AppendText(wxT(" "));
 			}
 
@@ -141,7 +141,7 @@
 bool FileDrop::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString &filenames) {
 	if (_target->IsEnabled()) {
 		if (_isFileChooser) {
-			if (!_target->IsEmpty()) {
+			if (!_target->GetValue().empty()) {
 				_target->AppendText(wxT(" "));
 			}
 

Modified: tools/branches/gsoc2007-toolsgui/tools_gui.h
===================================================================
--- tools/branches/gsoc2007-toolsgui/tools_gui.h	2007-08-17 08:49:55 UTC (rev 28644)
+++ tools/branches/gsoc2007-toolsgui/tools_gui.h	2007-08-17 10:10:57 UTC (rev 28645)
@@ -43,6 +43,12 @@
 wxString kDefaultFlacCompress = wxT("8");
 wxString kDefaultFlacBlocksize = wxT("1152");
 
+/* Compatibility with wx 2.6 */
+#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION <= 6
+#  define wxFD_OPEN wxOPEN
+#  define wxFD_FILE_MUST_EXIST wxFILE_MUST_EXIST
+#  define wxFD_MULTIPLE wxMULTIPLE
+#endif
 
 #define kNumCompressionTools 12
 wxString kCompressionToolNames[12] = {wxT("AGOS"), wxT("Broken Sword 1"), wxT("Broken Sword 2"), wxT("Encode DXA"), wxT("Flight of the Amazon Queen"), wxT("Kyra"), wxT("SAGA"), wxT("SCUMM BUN"), wxT("SCUMM SAN"), wxT("SCUMM SOU"), wxT("Simon 2 (MAC)"), wxT("Touche")};


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.