Upport scrolling changes and mouse wheel changes.

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

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index e953735ab7b88d2660c4fa1b02a078cb90f14432..8fb0ff6af241fa48908285c70ee0e5d5fcf1cf87 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -22,6 +22,8 @@
     #include "wx/mac/colordlg.h"
 #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/colordlg.h"
     #include "wx/mac/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"
 
 #else
     #include "wx/generic/colrdlgg.h"
 


@@ -31,7 +33,7 @@
 // get the colour from user and return it
 wxColour WXDLLEXPORT
 wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
 // get the colour from user and return it
 wxColour WXDLLEXPORT
 wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,

-                    const wxColour& colInit = wxNullColour);
+                    const wxColour& colInit = wxNullColour, const wxString& caption = wxEmptyString);

 
 #endif // wxUSE_COLOURDLG
 
 
 #endif // wxUSE_COLOURDLG