avoid warnings C4311/4312 when building with MSVC >= 7 (patch 1414052)

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

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

-#ifdef __GNUG__
-#pragma interface "colordlg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"

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


@@ -40,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,


@@ -54,7 +49,7 @@ protected:
 
     wxPoint             m_pos;
 
 
     wxPoint             m_pos;
 

-    DECLARE_DYNAMIC_CLASS(wxColourDialog)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourDialog)

 };
 
 #endif
 };
 
 #endif