build fixes

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

diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h
index 23cb6a6a62466bd2a017914a213f14f4f73ad990..621ebcaa2331d80fce9dbe411136716c7136bef6 100644 (file)
--- a/include/wx/msw/colordlg.h
+++ b/include/wx/msw/colordlg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COLORDLG_H_
 #define _WX_COLORDLG_H_
 
 #ifndef _WX_COLORDLG_H_
 #define _WX_COLORDLG_H_
 

-#include "wx/setup.h"
+#include "wx/defs.h"

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


@@ -36,9 +36,8 @@ public:
 
     virtual int ShowModal();
 
 
     virtual int ShowModal();
 

-    virtual void DoGetPosition( int *x, int *y ) const;
-

 protected:
 protected:

+    virtual void DoGetPosition( int *x, int *y ) const;

     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetSize(int x, int y,
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetSize(int x, int y,