X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/580616706f52835ee5ee48e6ef2ad15b822df971..edc536d358374987326d93adb1012b6eda9435a0:/include/wx/mgl/window.h diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h index 51bc37f24c..33f92875af 100644 --- a/include/wx/mgl/window.h +++ b/include/wx/mgl/window.h @@ -3,7 +3,7 @@ // Purpose: wxWindow class // Author: Vaclav Slavik // RCS-ID: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,10 +14,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma interface "window.h" -#endif - #include "wx/font.h" struct window_t; @@ -62,8 +58,6 @@ public: virtual bool Reparent(wxWindowBase *newParent); virtual void WarpPointer(int x, int y); - virtual void CaptureMouse(); - virtual void ReleaseMouse(); virtual void Refresh(bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL); @@ -91,22 +85,14 @@ 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 @@ -128,12 +114,15 @@ protected: int sizeFlags = wxSIZE_AUTO); virtual void DoSetClientSize(int width, int height); + virtual void DoCaptureMouse(); + virtual void DoReleaseMouse(); + // move the window to the specified location and resize it: this is called // from both DoSetSize() and DoSetClientSize() and would usually just call // ::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(); @@ -143,8 +132,8 @@ private: MGLDevCtx *m_paintMGLDC; friend class wxPaintDC; - DECLARE_DYNAMIC_CLASS(wxWindowMGL); - DECLARE_NO_COPY_CLASS(wxWindowMGL); + DECLARE_DYNAMIC_CLASS(wxWindowMGL) + DECLARE_NO_COPY_CLASS(wxWindowMGL) DECLARE_EVENT_TABLE() public: