Use wxGetTranslation() instead of _() in the public headers.

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

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 06323076cd16f44209a254739fe1bd691fb755d6..b4156d14600e71cf0bcd9b2d3c0abae9f0722543 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/colrdlgg.h
+// Name:        wx/colordlg.h
 // Purpose:     wxColourDialog
 // Author:      Vadim Zeitiln
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,12 +11,18 @@
 #ifndef _WX_COLORDLG_H_BASE_
 #define _WX_COLORDLG_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_COLOURDLG
 
+#include "wx/colourdata.h"
+
 #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"
 
@@ -25,9 +30,10 @@
 #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