various minor fixes to wxHashMap: compilation warnings suppressed, use calloc() inste...

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

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index d507ca36894fadabd825ee54945474a022f134c3..053f038c7052a20fbe743df96a2e78bc8afa9058 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -62,8 +62,6 @@ public:
     virtual bool Reparent(wxWindowBase *newParent);
 
     virtual void WarpPointer(int x, int y);
     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);
 
     virtual void Refresh(bool eraseBackground = TRUE,
                          const wxRect *rect = (const wxRect *) NULL);


@@ -102,22 +100,20 @@ public:
 #endif // WXWIN_COMPATIBILITY
 
     virtual WXWidget GetHandle() const { return m_wnd; }
 #endif // WXWIN_COMPATIBILITY
 
     virtual WXWidget GetHandle() const { return m_wnd; }

-
-    virtual void SetTitle(const wxString& title) { m_title = title; }
-    virtual wxString GetTitle() const { return m_title; }
+    
+    void SetMGLwindow_t(struct window_t *wnd);

 
     // implementation from now on
     // --------------------------
 
 protected:
 
     // implementation from now on
     // --------------------------
 
 protected:

-    wxString              m_title;

     // the window handle
     struct window_t      *m_wnd;
     // whether there should be wxEraseEvent before wxPaintEvent or not
     // (see wxWindow::Refresh)
     // the window handle
     struct window_t      *m_wnd;
     // whether there should be wxEraseEvent before wxPaintEvent or not
     // (see wxWindow::Refresh)

-    bool                  m_frozen;
-    bool                  m_refreshAfterThaw;
-    wxFont                m_font;
+    bool                  m_frozen:1;
+    bool                  m_refreshAfterThaw:1;
+    int                   m_eraseBackground;

 
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;
 
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;


@@ -130,6 +126,9 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
                            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
     // 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


@@ -145,16 +144,14 @@ private:
     MGLDevCtx *m_paintMGLDC;
     friend class wxPaintDC;
 
     MGLDevCtx *m_paintMGLDC;
     friend class wxPaintDC;
 

-    void OnEraseBackground(wxEraseEvent& event);
-    void OnSetFocus(wxFocusEvent& event);
-
-    DECLARE_DYNAMIC_CLASS(wxWindowMGL);
-    DECLARE_NO_COPY_CLASS(wxWindowMGL);
+    DECLARE_DYNAMIC_CLASS(wxWindowMGL)
+    DECLARE_NO_COPY_CLASS(wxWindowMGL)

     DECLARE_EVENT_TABLE()
 
 public:
     void HandlePaint(MGLDevCtx *dc);
     // needed by wxWindowPainter
     DECLARE_EVENT_TABLE()
 
 public:
     void HandlePaint(MGLDevCtx *dc);
     // needed by wxWindowPainter

+    MGLDevCtx *GetPaintMGLDC() const { return m_paintMGLDC; }

 };
 
 
 };