projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxGetMultiChoice() (which refuses to work for some reason - will fix
[wxWidgets.git]
/
include
/
wx
/
colordlg.h
diff --git
a/include/wx/colordlg.h
b/include/wx/colordlg.h
index 7500259cb85009f9b8a4734960c33ae7d13e46a7..984ce43dc84f43764a4f7b2b8db647b7f84b28f6 100644
(file)
--- a/
include/wx/colordlg.h
+++ b/
include/wx/colordlg.h
@@
-17,10
+17,14
@@
#include "wx/generic/colrdlgg.h"
#endif
#include "wx/generic/colrdlgg.h"
#endif
-#if
ndef __WXMSW__
+#if
!defined(__WXMSW__)
#define wxColourDialog wxGenericColourDialog
#define wxColourDialog wxGenericColourDialog
-#define sm_classwxColourDialog sm_classwxColourDialog
+#define sm_classwxColourDialog sm_classwx
Generic
ColourDialog
#endif
#endif
+// get the colour from user and return it
+wxColour WXDLLEXPORT wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
+ const wxColour& colInit = wxNullColour);
+
#endif
// _WX_COLORDLG_H_BASE_
#endif
// _WX_COLORDLG_H_BASE_