trying to fix memory leak in wxListCtrl (attributes not deleted)

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

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index 8a33aa8051d79073d89c381207a889b9c4ea7dbe..ba8b50315f183f1d4ba1b95b9a4821e1e8345d5f 100644 (file)
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -86,7 +86,6 @@ public:
 
     virtual void SetFocus();
 
 
     virtual void SetFocus();
 

-    virtual bool Reparent( wxWindow *newParent );

 
     virtual void WarpPointer(int x, int y);
     virtual void CaptureMouse();
 
     virtual void WarpPointer(int x, int y);
     virtual void CaptureMouse();


@@ -155,8 +154,6 @@ public:
 
     // Native resource loading (implemented in src/msw/nativdlg.cpp)
     // FIXME: should they really be all virtual?
 
     // Native resource loading (implemented in src/msw/nativdlg.cpp)
     // FIXME: should they really be all virtual?

-    virtual bool LoadNativeDialog(wxWindow* parent, wxWindowID& id);
-    virtual bool LoadNativeDialog(wxWindow* parent, const wxString& name);

     wxWindow* GetWindowChild1(wxWindowID id);
     wxWindow* GetWindowChild(wxWindowID id);
 
     wxWindow* GetWindowChild1(wxWindowID id);
     wxWindow* GetWindowChild(wxWindowID id);
 


@@ -182,6 +179,9 @@ public:
     // --------------
     void OnEraseBackground(wxEraseEvent& event);
     void OnIdle(wxIdleEvent& event);
     // --------------
     void OnEraseBackground(wxEraseEvent& event);
     void OnIdle(wxIdleEvent& event);

+    void MacOnScroll(wxScrollEvent&event ) ;
+    
+    bool AcceptsFocus() const ;

 
 public:
     // For implementation purposes - sometimes decorations make the client area
 
 public:
     // For implementation purposes - sometimes decorations make the client area


@@ -209,12 +209,6 @@ public:
     virtual void MSWDeviceToLogical(float *x, float *y) const;
 #endif // WXWIN_COMPATIBILITY
 
     virtual void MSWDeviceToLogical(float *x, float *y) const;
 #endif // WXWIN_COMPATIBILITY
 

-    // Create an appropriate wxWindow from a HWND
-    virtual wxWindow* CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd);
-
-    // Make sure the window style reflects the HWND style (roughly)
-    virtual void AdoptAttributesFromHWND();
-

     // Setup background and foreground colours correctly
     virtual void SetupColours();
 
     // Setup background and foreground colours correctly
     virtual void SetupColours();
 


@@ -242,10 +236,12 @@ public :
        virtual void                                            MacFireMouseEvent( EventRecord *ev ) ;
        virtual bool                                            MacDispatchMouseEvent(wxMouseEvent& event ) ;
        virtual void                                            MacEraseBackground( Rect *rect ) ;
        virtual void                                            MacFireMouseEvent( EventRecord *ev ) ;
        virtual bool                                            MacDispatchMouseEvent(wxMouseEvent& event ) ;
        virtual void                                            MacEraseBackground( Rect *rect ) ;

+       virtual void                                            MacPaint( wxPaintEvent &event ) ;

        WindowRef                                                               GetMacRootWindow() const  ;
 
        virtual ControlHandle   MacGetContainerForEmbedding() ;
        virtual void                                            MacSuperChangedPosition() ;
        WindowRef                                                               GetMacRootWindow() const  ;
 
        virtual ControlHandle   MacGetContainerForEmbedding() ;
        virtual void                                            MacSuperChangedPosition() ;

+       virtual void                                            MacSuperShown( bool show ) ;

 
        bool                                                                            MacSetupFocusPort() ;
        bool                                                                            MacSetupDrawingPort() ;
 
        bool                                                                            MacSetupFocusPort() ;
        bool                                                                            MacSetupDrawingPort() ;


@@ -259,6 +255,7 @@ public :
        virtual void                                            MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindow** rootwin) ;
        MacWindowData*                                          MacGetWindowData() { return m_macWindowData ; }
        static WindowRef                                        MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
        virtual void                                            MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindow** rootwin) ;
        MacWindowData*                                          MacGetWindowData() { return m_macWindowData ; }
        static WindowRef                                        MacGetWindowInUpdate() { return s_macWindowInUpdate ; }

+       bool                                                            MacIsWindowScrollbar( const wxScrollBar* sb ) { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }

        static wxWindow*                                        s_lastMouseWindow ;
 private:
        virtual bool                                            MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) ;
        static wxWindow*                                        s_lastMouseWindow ;
 private:
        virtual bool                                            MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) ;


@@ -303,10 +300,6 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 

-    // get the size which best suits the window: e.g., for a static text it
-    // will be the width and height of the text
-    virtual wxSize DoGetBestSize();
-

     // 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