rename the ID parameter

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

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index 7758b50e97629e172df14e3339f90603e1bed38d..074cc19b5bdc79d5c52447879d50ffb60c5c4ae2 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;


@@ -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,7 +65,7 @@ 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();
     virtual void Clear();
                          const wxRect *rect = (const wxRect *) NULL);
     virtual void Update();
     virtual void Clear();


@@ -71,7 +73,7 @@ public:
     virtual void Thaw();
 
     virtual bool SetCursor(const wxCursor &cursor);
     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 int GetCharHeight() const;
     virtual int GetCharWidth() const;


@@ -90,12 +92,12 @@ 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:
     void OnInternalIdle();
 
 protected:


@@ -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);
     // ::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();
 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_