X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..0995b9dc18a7ce898c1c1be0e2790b258cab0fee:/include/wx/mgl/window.h?ds=inline

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index 33f92875af..8f72a27476 100644
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -23,7 +23,7 @@ class MGLDevCtx;
 // wxWindow declaration for MGL
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindowMGL : public wxWindowBase
+class WXDLLIMPEXP_CORE wxWindowMGL : public wxWindowBase
 {
 public:
     wxWindowMGL() { Init(); }
@@ -48,10 +48,16 @@ public:
                 long style = 0,
                 const wxString& name = wxPanelNameStr);
 
+    // implement base class (pure) virtual methods
+    // -------------------------------------------
+
+    virtual void SetLabel( const wxString &WXUNUSED(label) ) {}
+    virtual wxString GetLabel() const { return wxEmptyString; }
+
     virtual void Raise();
     virtual void Lower();
 
-    virtual bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);
 
     virtual void SetFocus();
 
@@ -59,24 +65,15 @@ public:
 
     virtual void WarpPointer(int x, int y);
 
-    virtual void Refresh(bool eraseBackground = TRUE,
+    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 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);
@@ -86,24 +83,30 @@ public:
     virtual void DragAcceptFiles(bool accept);
 
     virtual WXWidget GetHandle() const { return m_wnd; }
-    
+
     void SetMGLwindow_t(struct window_t *wnd);
 
     // implementation from now on
     // --------------------------
-    
-    void OnInternalIdle();
 
 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)
-    bool                  m_frozen:1;
     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;
@@ -122,18 +125,18 @@ protected:
     // ::MoveWindow() except for composite controls which will want to arrange
     // themselves inside the given rectangle
     virtual void DoMoveWindow(int x, int y, int width, int height);
-    
+
 private:
     // common part of all ctors
     void Init();
     // counterpart to SetFocus
     void KillFocus();
-    
+
     MGLDevCtx *m_paintMGLDC;
     friend class wxPaintDC;
 
     DECLARE_DYNAMIC_CLASS(wxWindowMGL)
-    DECLARE_NO_COPY_CLASS(wxWindowMGL)
+    wxDECLARE_NO_COPY_CLASS(wxWindowMGL);
     DECLARE_EVENT_TABLE()
 
 public:
@@ -143,5 +146,4 @@ public:
 };
 
 
-#endif
-    // _WX_WINDOW_H_
+#endif // _WX_WINDOW_H_