diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 0e3c7cfaf4..75e6b83f7d 100644
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -17,9 +17,9 @@
 #include "wx/generic/colrdlgg.h"
 #endif
 
-#if defined(__WXMSW__)
+#if !defined(__WXMSW__)
 #define wxColourDialog wxGenericColourDialog
-#define sm_classwxColourDialog sm_classwxColourDialog
+#define sm_classwxColourDialog sm_classwxGenericColourDialog
 #endif
 
 #endif
diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index 35dc8fd95e..2b9e0dc4e1 100644
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -111,8 +111,10 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
 DECLARE_EVENT_TABLE()
 };
 
+/* This shouldn't be necessary, we have a #define in wx/colordlg.h.
 #ifdef __WXGTK__
 typedef wxGenericColourDialog wxColourDialog;
 #endif
+*/
 
 #endif