Fix warnings in the MSW IE backend.

[wxWidgets.git] / include / wx / mgl / window.h

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index 074cc19b5bdc79d5c52447879d50ffb60c5c4ae2..8f72a2747612871618521c6f3d6d14c310793f80 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -23,7 +23,7 @@ class MGLDevCtx;
 // wxWindow declaration for MGL
 // ---------------------------------------------------------------------------
 
 // wxWindow declaration for MGL
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindowMGL : public wxWindowBase
+class WXDLLIMPEXP_CORE wxWindowMGL : public wxWindowBase

 {
 public:
     wxWindowMGL() { Init(); }
 {
 public:
     wxWindowMGL() { Init(); }


@@ -68,21 +68,12 @@ public:
     virtual void Refresh(bool eraseBackground = true,
                          const wxRect *rect = (const wxRect *) NULL);
     virtual void Update();
     virtual void Refresh(bool eraseBackground = true,
                          const wxRect *rect = (const wxRect *) NULL);
     virtual void Update();

-    virtual void Clear();
-    virtual void Freeze();
-    virtual void Thaw();

 
     virtual bool SetCursor(const wxCursor &cursor);
     virtual bool SetFont(const wxFont &font) { m_font = font; return true; }
 
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;
 
     virtual bool SetCursor(const wxCursor &cursor);
     virtual bool SetFont(const wxFont &font) { m_font = font; return true; }
 
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;

-    virtual void GetTextExtent(const wxString& string,
-                               int *x, int *y,
-                               int *descent = (int *) NULL,
-                               int *externalLeading = (int *) NULL,
-                               const wxFont *theFont = (const wxFont *) NULL)
-                               const;

 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget(wxDropTarget *dropTarget);
 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget(wxDropTarget *dropTarget);


@@ -98,18 +89,24 @@ public:
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 

-    void OnInternalIdle();
-

 protected:
 protected:

+    virtual void DoFreeze();
+    virtual void DoThaw();
+
+

     // the window handle
     struct window_t      *m_wnd;
     // whether there should be wxEraseEvent before wxPaintEvent or not
     // (see wxWindow::Refresh)
     // the window handle
     struct window_t      *m_wnd;
     // whether there should be wxEraseEvent before wxPaintEvent or not
     // (see wxWindow::Refresh)

-    bool                  m_frozen:1;

     bool                  m_refreshAfterThaw:1;
     int                   m_eraseBackground;
 
     // implement the base class pure virtuals
     bool                  m_refreshAfterThaw:1;
     int                   m_eraseBackground;
 
     // implement the base class pure virtuals

+    virtual void DoGetTextExtent(const wxString& string,
+                                 int *x, int *y,
+                                 int *descent = NULL,
+                                 int *externalLeading = NULL,
+                                 const wxFont *font = NULL) const;

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


@@ -139,7 +136,7 @@ private:
     friend class wxPaintDC;
 
     DECLARE_DYNAMIC_CLASS(wxWindowMGL)
     friend class wxPaintDC;
 
     DECLARE_DYNAMIC_CLASS(wxWindowMGL)

-    DECLARE_NO_COPY_CLASS(wxWindowMGL)
+    wxDECLARE_NO_COPY_CLASS(wxWindowMGL);

     DECLARE_EVENT_TABLE()
 
 public:
     DECLARE_EVENT_TABLE()
 
 public: