fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index 7b99981b6c41374b0ed80cb1d8aa27db21ce239d..074cc19b5bdc79d5c52447879d50ffb60c5c4ae2 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -14,10 +14,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #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,7 +65,7 @@ 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();
@@ -71,7 +73,7 @@ public:
     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;
@@ -89,23 +91,15 @@ public:
     // Accept files for dragging
     virtual void DragAcceptFiles(bool accept);
 
-#if WXWIN_COMPATIBILITY
-    // event handlers
-        // Handle a control command
-    virtual void OnCommand(wxWindow& win, wxCommandEvent& event);
-
-        // Override to define new behaviour for default action (e.g. double
-        // clicking on a listbox)
-    virtual void OnDefaultAction(wxControl * WXUNUSED(initiatingItem)) { }
-#endif // WXWIN_COMPATIBILITY
-
     virtual WXWidget GetHandle() const { return m_wnd; }
-    
+
     void SetMGLwindow_t(struct window_t *wnd);
 
     // implementation from now on
     // --------------------------
 
+    void OnInternalIdle();
+
 protected:
     // the window handle
     struct window_t      *m_wnd;
@@ -134,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);
-    
-    void OnIdle(wxIdleEvent& event);
 
 private:
     // common part of all ctors
     void Init();
     // counterpart to SetFocus
     void KillFocus();
-    
+
     MGLDevCtx *m_paintMGLDC;
     friend class wxPaintDC;
 
@@ -157,5 +149,4 @@ public:
 };
 
 
-#endif
-    // _WX_WINDOW_H_
+#endif // _WX_WINDOW_H_