1. moved InheritAttributes() from wxControl to wxWindow

[wxWidgets.git] / include / wx / colordlg.h

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 54a8fdc5153039a8c313506e030caa85085cd871..f08d224b5b393cde9bfda24808968f5bebefe0f9 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -14,13 +14,14 @@
 
 #if wxUSE_COLOURDLG
 
 
 #if wxUSE_COLOURDLG
 

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

     #include "wx/msw/colordlg.h"
     #include "wx/msw/colordlg.h"

+#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
+    #include "wx/mac/colordlg.h"

 #else
     #include "wx/generic/colrdlgg.h"
 
     #define wxColourDialog wxGenericColourDialog
 #else
     #include "wx/generic/colrdlgg.h"
 
     #define wxColourDialog wxGenericColourDialog

-    #define sm_classwxColourDialog sm_classwxGenericColourDialog

 #endif
 
 // get the colour from user and return it
 #endif
 
 // get the colour from user and return it