Corrections

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 0e3c7cfaf4adabc44b60c18022ea7b9a8b5d106c..75e6b83f7d853b260de8f918209ff5e26307f2ac 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -17,9 +17,9 @@
 #include "wx/generic/colrdlgg.h"
 #endif
 
 #include "wx/generic/colrdlgg.h"
 #endif
 

-#if defined(__WXMSW__)
+#if !defined(__WXMSW__)

 #define wxColourDialog wxGenericColourDialog
 #define wxColourDialog wxGenericColourDialog

-#define sm_classwxColourDialog sm_classwxColourDialog
+#define sm_classwxColourDialog sm_classwxGenericColourDialog

 #endif
 
 #endif
 #endif
 
 #endif

diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index 35dc8fd95ed6ada59521b55c1280cbec888f4cd5..2b9e0dc4e11e958b8ab4ff72c200446dec13d357 100644 (file)
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -111,8 +111,10 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

+/* This shouldn't be necessary, we have a #define in wx/colordlg.h.

 #ifdef __WXGTK__
 typedef wxGenericColourDialog wxColourDialog;
 #endif
 #ifdef __WXGTK__
 typedef wxGenericColourDialog wxColourDialog;
 #endif

+*/

 
 #endif
 
 #endif