fix the wrong #ifdef WXWIN_COMPATIBILITY_2_8 checks, #if should be used (#9644)

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

diff --git a/include/wx/gtk1/colordlg.h b/include/wx/gtk1/colordlg.h
index 9db85c55a21aa5977dfbf5300eea1d973a089cb4..5da29e6af3468d7855a20ad3182d6ed3c80db798 100644 (file)
--- a/include/wx/gtk1/colordlg.h
+++ b/include/wx/gtk1/colordlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/colordlg.h
+// Name:        wx/gtk1/colordlg.h

 // Purpose:     wxColourDialog
 // Author:      Vaclav Slavik
 // Modified by:
 // Purpose:     wxColourDialog
 // Author:      Vaclav Slavik
 // Modified by:


@@ -12,17 +12,13 @@
 #ifndef __COLORDLG_H__
 #define __COLORDLG_H__
 
 #ifndef __COLORDLG_H__
 #define __COLORDLG_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "colordlg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"

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

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

 {
 public:
     wxColourDialog() {}
 {
 public:
     wxColourDialog() {}


@@ -39,15 +35,16 @@ public:
 protected:
     // implement some base class methods to do nothing to avoid asserts and
     // GTK warnings, since this is not a real wxDialog.
 protected:
     // implement some base class methods to do nothing to avoid asserts and
     // GTK warnings, since this is not a real wxDialog.

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO) {}
-    virtual void DoMoveWindow(int x, int y, int width, int height) {}
+    virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
+                           int WXUNUSED(width), int WXUNUSED(height),
+                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
+    virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y),
+                              int WXUNUSED(width), int WXUNUSED(height)) {}

 
     // copy data between the dialog and m_colourData:
     void ColourDataToDialog();
     void DialogToColourData();
 
     // copy data between the dialog and m_colourData:
     void ColourDataToDialog();
     void DialogToColourData();

-    
+

     wxColourData m_data;
 
     DECLARE_DYNAMIC_CLASS(wxColourDialog)
     wxColourData m_data;
 
     DECLARE_DYNAMIC_CLASS(wxColourDialog)