Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index 0d59436e90d4d36605449e3f991d575edb8e1649..d792b7aac193f9241b90669d278287e4533c2c67 100644 (file)
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -9,13 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __COLORDLGH_G__
-#define __COLORDLGH_G__
+#ifndef _WX_COLORDLGG_H_
+#define _WX_COLORDLGG_H_

 
 

-#include "wx/defs.h"

 #include "wx/gdicmn.h"
 #include "wx/dialog.h"
 #include "wx/gdicmn.h"
 #include "wx/dialog.h"

-#include "wx/cmndata.h"

 
 #define wxID_ADD_CUSTOM     3000
 
 
 #define wxID_ADD_CUSTOM     3000
 


@@ -29,15 +27,15 @@
 
 #endif // wxUSE_SLIDER
 
 
 #endif // wxUSE_SLIDER
 

-class WXDLLEXPORT wxGenericColourDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxGenericColourDialog : public wxDialog

 {
 public:
     wxGenericColourDialog();
     wxGenericColourDialog(wxWindow *parent,
 {
 public:
     wxGenericColourDialog();
     wxGenericColourDialog(wxWindow *parent,

-                          wxColourData *data = (wxColourData *) NULL);
+                          wxColourData *data = NULL);

     virtual ~wxGenericColourDialog();
 
     virtual ~wxGenericColourDialog();
 

-    bool Create(wxWindow *parent, wxColourData *data = (wxColourData *) NULL);
+    bool Create(wxWindow *parent, wxColourData *data = NULL);

 
     wxColourData &GetColourData() { return m_colourData; }
 
 
     wxColourData &GetColourData() { return m_colourData; }
 


@@ -116,4 +114,4 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxGenericColourDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxGenericColourDialog)
 };
 

-#endif
+#endif // _WX_COLORDLGG_H_