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 f08d224b5b393cde9bfda24808968f5bebefe0f9..2f9df471921863ca934ce44c014eac78e2c8b8f1 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -1,23 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxColourDialog
 // Author:      Vadim Zeitiln
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxColourDialog
 // Author:      Vadim Zeitiln
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLORDLG_H_BASE_
 #define _WX_COLORDLG_H_BASE_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COLORDLG_H_BASE_
 #define _WX_COLORDLG_H_BASE_
 

+#include "wx/defs.h"
+

 #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__)
 #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"

 #else
     #include "wx/generic/colrdlgg.h"
 
 #else
     #include "wx/generic/colrdlgg.h"
 


@@ -25,9 +31,10 @@
 #endif
 
 // get the colour from user and return it
 #endif
 
 // get the colour from user and return it

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

 
 #endif // wxUSE_COLOURDLG
 
 
 #endif // wxUSE_COLOURDLG