A few tweaks and cleanups

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

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index 513d01e7347c814f015aec90aaadad6f2676fcd6..8ab6a1c366465c4bb1b0fa0788a4ad912d26fc91 100644 (file)
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -29,16 +29,9 @@ class WXDLLEXPORT wxTopLevelWindowMac;
 // constants
 // ---------------------------------------------------------------------------
 
 // constants
 // ---------------------------------------------------------------------------
 

-// FIXME does anybody use those? they're unused by wxWindows...
-enum
-{
-    wxKEY_SHIFT = 1,
-    wxKEY_CTRL  = 2
-};
-

 class WXDLLEXPORT wxWindowMac: public wxWindowBase
 {
 class WXDLLEXPORT wxWindowMac: public wxWindowBase
 {

-  DECLARE_DYNAMIC_CLASS(wxWindowMac);
+  DECLARE_DYNAMIC_CLASS(wxWindowMac)

 
   friend class wxDC;
   friend class wxPaintDC;
 
   friend class wxDC;
   friend class wxPaintDC;


@@ -81,8 +74,6 @@ public:
     virtual void SetFocus();
 
     virtual void WarpPointer(int x, int y);
     virtual void SetFocus();
 
     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 );


@@ -219,7 +210,8 @@ public :
        virtual bool                                            MacCanFocus() const { return true ; }
 
        virtual bool                                            MacDispatchMouseEvent(wxMouseEvent& event ) ;
        virtual bool                                            MacCanFocus() const { return true ; }
 
        virtual bool                                            MacDispatchMouseEvent(wxMouseEvent& event ) ;

-
+       // this should not be overriden in classes above wxWindowMac because it is called from its destructor via DeleteChildren
+  virtual void            RemoveChild( wxWindowBase *child );

        virtual void                                            MacPaintBorders( int left , int top ) ;
        WXWindow                                                    MacGetRootWindow() const  ;
        wxTopLevelWindowMac*                MacGetTopLevelWindow() const ;
        virtual void                                            MacPaintBorders( int left , int top ) ;
        WXWindow                                                    MacGetRootWindow() const  ;
        wxTopLevelWindowMac*                MacGetTopLevelWindow() const ;


@@ -290,6 +282,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