wxDropSource should have def ctor

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

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 8e113d039ef91ce92dfe58269b15fb83d3923468..984ce43dc84f43764a4f7b2b8db647b7f84b28f6 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -1,13 +1,30 @@
-#ifndef __COLORDLGH_BASE__
-#define __COLORDLGH_BASE__
+#ifndef _WX_COLORDLG_H_BASE_
+#define _WX_COLORDLG_H_BASE_

 
 

-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)

 #include "wx/msw/colordlg.h"
 #include "wx/msw/colordlg.h"

-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)

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

-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
+#include "wx/generic/colrdlgg.h"
+#elif defined(__WXQT__)
+#include "wx/generic/colrdlgg.h"
+#elif defined(__WXMAC__)
+#include "wx/generic/colrdlgg.h"
+#elif defined(__WXPM__)
+#include "wx/generic/colrdlgg.h"
+#elif defined(__WXSTUBS__)

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

+#if !defined(__WXMSW__)
+#define wxColourDialog wxGenericColourDialog
+#define sm_classwxColourDialog sm_classwxGenericColourDialog
+#endif
+
+// get the colour from user and return it
+wxColour WXDLLEXPORT wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
+                                         const wxColour& colInit = wxNullColour);
+

 #endif
 #endif

-    // __COLORDLGH_BASE__
+    // _WX_COLORDLG_H_BASE_