Added wxExtHelpController: wxHelpController implementation for external

[wxWidgets.git] / include / wx / generic / colrdlgg.h

diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index f82865066b868315e1534840913f800355fbce72..23fac19e1a07133fe668f677b0b352d7b1646c0d 100644 (file)
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -76,10 +76,10 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
 //  static bool colourDialogCancelled;
  public:
   wxGenericColourDialog(void);
-  wxGenericColourDialog(wxWindow *parent, wxColourData *data = NULL);
+  wxGenericColourDialog(wxWindow *parent, wxColourData *data = (wxColourData *) NULL);
   ~wxGenericColourDialog(void);
 
-  bool Create(wxWindow *parent, wxColourData *data = NULL);
+  bool Create(wxWindow *parent, wxColourData *data = (wxColourData *) NULL);
 
   int ShowModal(void);
   wxColourData GetColourData(void) { return colourData; }
@@ -116,7 +116,7 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
 DECLARE_EVENT_TABLE()
 };
 
-#ifdef __GTK__
+#ifdef __WXGTK__
 typedef wxGenericColourDialog wxColourDialog;
 #endif