moved wxHtmlWindow flags out of defs.h

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 790c282c83d9ac6b0041ecd1a31683c4821ca4fe..ec980f4392a8ed170516ed0f90e8ae3f923cc7db 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -90,8 +90,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 );


@@ -195,7 +193,6 @@ FUNCTION IS NOW A MEMBER OF wxFrame - gt
     // event handlers
     // --------------
 
     // event handlers
     // --------------
 

-    void OnSetFocus(wxFocusEvent& event);

     void OnEraseBackground(wxEraseEvent& event);
     void OnIdle(wxIdleEvent& event);
     void OnPaint(wxPaintEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
     void OnIdle(wxIdleEvent& event);
     void OnPaint(wxPaintEvent& event);


@@ -376,9 +373,6 @@ public:
     // called when the window is about to be destroyed
     virtual void MSWDestroyWindow();
 
     // called when the window is about to be destroyed
     virtual void MSWDestroyWindow();
 

-    // Detach "Window" menu from menu bar so it doesn't get deleted
-    void MSWDetachWindowMenu();
-

     // this function should return the brush to paint the window background
     // with or 0 for the default brush
     virtual WXHBRUSH OnCtlColor(WXHDC hDC,
     // this function should return the brush to paint the window background
     // with or 0 for the default brush
     virtual WXHBRUSH OnCtlColor(WXHDC hDC,


@@ -442,6 +436,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