added wxZlibStream::SetDictionary() (closes #10551)

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

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 1137022d2163b2d409e3c9aa1619e5560c23c989..d5693becf3a2cdadbc1bc4bc9f1dfc9bc13896ed 100644 (file)
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -138,7 +138,7 @@ public:
 
     // event handlers
     // --------------
 
     // event handlers
     // --------------

-    void OnPaint( wxPaintEvent& event );
+

     void OnNcPaint( wxNcPaintEvent& event );
     void OnEraseBackground(wxEraseEvent& event );
     void OnMouseEvent( wxMouseEvent &event );
     void OnNcPaint( wxNcPaintEvent& event );
     void OnEraseBackground(wxEraseEvent& event );
     void OnMouseEvent( wxMouseEvent &event );


@@ -163,11 +163,12 @@ public:
     wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     virtual void        TriggerScrollEvent( wxEventType scrollEvent ) ;
     wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     virtual void        TriggerScrollEvent( wxEventType scrollEvent ) ;

-    virtual bool        MacDoRedraw( void* updatergn , long time ) ;
-

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

+    
+    virtual bool        MacDoRedraw( long time ) ;
+    virtual void        MacPaintChildrenBorders();

     virtual void        MacPaintBorders( int left , int top ) ;
     void                MacPaintGrowBox();
 
     virtual void        MacPaintBorders( int left , int top ) ;
     void                MacPaintGrowBox();
 


@@ -338,7 +339,7 @@ private:
     void DoUpdateScrollbarVisibility();
 
 
     void DoUpdateScrollbarVisibility();
 
 

-    DECLARE_NO_COPY_CLASS(wxWindowMac)
+    wxDECLARE_NO_COPY_CLASS(wxWindowMac);

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };