Implement wxMenuItemAction: and validateMenuItem: delegate messages

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

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index 7b99981b6c41374b0ed80cb1d8aa27db21ce239d..7758b50e97629e172df14e3339f90603e1bed38d 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -14,7 +14,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "window.h"
 #endif
 
     #pragma interface "window.h"
 #endif
 


@@ -89,22 +89,14 @@ public:
     // Accept files for dragging
     virtual void DragAcceptFiles(bool accept);
 
     // 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
     // --------------------------
     virtual WXWidget GetHandle() const { return m_wnd; }
     
     void SetMGLwindow_t(struct window_t *wnd);
 
     // implementation from now on
     // --------------------------

+    
+    void OnInternalIdle();

 
 protected:
     // the window handle
 
 protected:
     // the window handle


@@ -135,8 +127,6 @@ protected:
     // themselves inside the given rectangle
     virtual void DoMoveWindow(int x, int y, int width, int height);
     
     // 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();
 private:
     // common part of all ctors
     void Init();