wxSocket::Initialize() and Shutdown() are for main thread only.

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

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index d0aac1af88f7fa31bd580967e1e99687583c208c..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__)


@@ -33,7 +33,7 @@
 class WXDLLIMPEXP_FWD_CORE wxColourData;
 
 // get the colour from user and return it
 class WXDLLIMPEXP_FWD_CORE wxColourData;
 
 // get the colour from user and return it

-WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
+WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = NULL,

                                               const wxColour& colInit = wxNullColour,
                                               const wxString& caption = wxEmptyString,
                                               wxColourData *data = NULL);
                                               const wxColour& colInit = wxNullColour,
                                               const wxString& caption = wxEmptyString,
                                               wxColourData *data = NULL);