addind nonowned window implementation

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

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index cd88d8902e564b306ef2ab3467766803dfef16bf..738bc927fb02cce587f1365a4caa8fc303346c5a 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WINDOW_H_
@@ -14,10 +14,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "window.h"
-#endif
-
 #include "wx/font.h"
 
 struct window_t;
@@ -52,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();
 
@@ -63,15 +65,12 @@ 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;
@@ -90,20 +89,23 @@ 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;
 
@@ -126,13 +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);
-    
+
 private:
     // common part of all ctors
     void Init();
     // counterpart to SetFocus
     void KillFocus();
-    
+
     MGLDevCtx *m_paintMGLDC;
     friend class wxPaintDC;
 
@@ -147,5 +149,4 @@ public:
 };
 
 
-#endif
-    // _WX_WINDOW_H_
+#endif // _WX_WINDOW_H_