Reapply wxWeakRef patch again

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

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index f465825db5bef3f29cbcef525a3b57d868e0a8b3..e47e113bfc62e01cd84299ca3ae2b3c00dcc7fad 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -14,10 +14,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "window.h"
-#endif
-

 #include "wx/font.h"
 
 struct window_t;
 #include "wx/font.h"
 
 struct window_t;


@@ -27,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(); }


@@ -52,10 +48,16 @@ public:
                 long style = 0,
                 const wxString& name = wxPanelNameStr);
 
                 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 void Raise();
     virtual void Lower();
 

-    virtual bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);

 
     virtual void SetFocus();
 
 
     virtual void SetFocus();
 


@@ -63,15 +65,12 @@ public:
 
     virtual void WarpPointer(int x, int y);
 
 
     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();
                          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 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 int GetCharHeight() const;
     virtual int GetCharWidth() const;


@@ -90,18 +89,23 @@ public:
     virtual void DragAcceptFiles(bool accept);
 
     virtual WXWidget GetHandle() const { return m_wnd; }
     virtual void DragAcceptFiles(bool accept);
 
     virtual WXWidget GetHandle() const { return m_wnd; }

-    
+

     void SetMGLwindow_t(struct window_t *wnd);
 
     // implementation from now on
     // --------------------------
 
     void SetMGLwindow_t(struct window_t *wnd);
 
     // 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;
 
     bool                  m_refreshAfterThaw:1;
     int                   m_eraseBackground;
 


@@ -124,15 +128,13 @@ 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);
     // ::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);

-    
-    void OnInternalIdle();

 
 private:
     // common part of all ctors
     void Init();
     // counterpart to SetFocus
     void KillFocus();
 
 private:
     // common part of all ctors
     void Init();
     // counterpart to SetFocus
     void KillFocus();

-    
+

     MGLDevCtx *m_paintMGLDC;
     friend class wxPaintDC;
 
     MGLDevCtx *m_paintMGLDC;
     friend class wxPaintDC;
 


@@ -147,5 +149,4 @@ public:
 };
 
 
 };
 
 

-#endif
-    // _WX_WINDOW_H_
+#endif // _WX_WINDOW_H_