no changes, just remove #if'd out code

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

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 8fb0ff6af241fa48908285c70ee0e5d5fcf1cf87..2015970c473cfd956393be6cf1d652a4a67faf8f 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -19,7 +19,7 @@
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/colordlg.h"
 #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/colordlg.h"
 #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)

-    #include "wx/mac/colordlg.h"
+    #include "wx/osx/colordlg.h"

 #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/colordlg.h"
 #elif defined(__WXPALMOS__)
 #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/colordlg.h"
 #elif defined(__WXPALMOS__)


@@ -30,10 +30,13 @@
     #define wxColourDialog wxGenericColourDialog
 #endif
 
     #define wxColourDialog wxGenericColourDialog
 #endif
 

+class WXDLLIMPEXP_FWD_CORE wxColourData;
+

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

-wxColour WXDLLEXPORT
-wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
-                    const wxColour& colInit = wxNullColour, const wxString& caption = wxEmptyString);
+WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = NULL,
+                                              const wxColour& colInit = wxNullColour,
+                                              const wxString& caption = wxEmptyString,
+                                              wxColourData *data = NULL);

 
 #endif // wxUSE_COLOURDLG
 
 
 #endif // wxUSE_COLOURDLG