Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 7c36c2b1a71128ec8d74b32d3e3521d6670afb08..2f9df471921863ca934ce44c014eac78e2c8b8f1 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/colrdlgg.h
+// Name:        wx/colordlg.h

 // Purpose:     wxColourDialog
 // Author:      Vadim Zeitiln
 // Modified by:
 // Purpose:     wxColourDialog
 // Author:      Vadim Zeitiln
 // Modified by:


@@ -16,24 +16,22 @@
 
 #if wxUSE_COLOURDLG
 
 
 #if wxUSE_COLOURDLG
 

+#include "wx/colourdata.h"
+

 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/colordlg.h"
 #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
     #include "wx/osx/colordlg.h"
 #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/colordlg.h"
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/colordlg.h"
 #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
     #include "wx/osx/colordlg.h"
 #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/colordlg.h"

-#elif defined(__WXPALMOS__)
-    #include "wx/palmos/colordlg.h"

 #else
     #include "wx/generic/colrdlgg.h"
 
     #define wxColourDialog wxGenericColourDialog
 #endif
 
 #else
     #include "wx/generic/colrdlgg.h"
 
     #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

-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);