added ISO-2022-JP encoding

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

diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h
index cf93a514efd0ed7de6f4926bdb44b6a215925f7d..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"
 


@@ -36,11 +32,12 @@ public:
 
     // override some base class virtuals
     virtual void SetTitle(const wxString& title);
 
     // override some base class virtuals
     virtual void SetTitle(const wxString& title);

-    virtual wxString GetTitle();
+    virtual wxString GetTitle() const;

 
     virtual int ShowModal();
 
 protected:
 
     virtual int ShowModal();
 
 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,


@@ -50,7 +47,9 @@ protected:
     wxColourData        m_colourData;
     wxString            m_title;
 
     wxColourData        m_colourData;
     wxString            m_title;
 

-    DECLARE_DYNAMIC_CLASS(wxColourDialog)
+    wxPoint             m_pos;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourDialog)

 };
 
 #endif
 };
 
 #endif