X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09b632b21aaeb422391ce10e63576e5ad61cdc36..7a04b644092ff91f8f2c6ecdd191e96285d39a1d:/include/wx/mac/carbon/window.h

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 8eb8950e94..0092b70fc7 100644
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -17,11 +17,11 @@
 
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxScrollBar;
-class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowMac;
+class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
 
-class wxMacControl ;
+class WXDLLIMPEXP_FWD_CORE wxMacControl ;
 
-class WXDLLEXPORT wxWindowMac: public wxWindowBase
+class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase
 {
     DECLARE_DYNAMIC_CLASS(wxWindowMac)
 
@@ -56,15 +56,14 @@ public:
 
     virtual bool Show( bool show = true );
 
+    virtual bool IsShownOnScreen() const;
+
     virtual void SetFocus();
 
     virtual void WarpPointer( int x, int y );
 
     virtual void Refresh( bool eraseBackground = true,
                           const wxRect *rect = NULL );
-    virtual void Freeze();
-    virtual void Thaw();
-    virtual bool IsFrozen() const;
 
     virtual void Update() ;
     virtual void ClearBackground();
@@ -84,9 +83,11 @@ public:
                                const;
 protected:
     virtual void DoEnable( bool enable );
-    virtual void OnEnabled( bool enabled );
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 
+    virtual void DoFreeze();
+    virtual void DoThaw();
+
 public:
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = true );
@@ -137,7 +138,6 @@ public:
 
     // event handlers
     // --------------
-    void OnSetFocus( wxFocusEvent& event );
     void OnPaint( wxPaintEvent& event );
     void OnNcPaint( wxNcPaintEvent& event );
     void OnEraseBackground(wxEraseEvent& event );
@@ -163,7 +163,7 @@ public:
     wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     virtual void        MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
-    virtual bool        MacDoRedraw( WXHRGN updatergn , long time ) ;
+    virtual bool        MacDoRedraw( void* updatergn , long time ) ;
     virtual bool        MacCanFocus() const ;
 
     // this should not be overriden in classes above wxWindowMac
@@ -177,7 +177,7 @@ public:
     void                MacInvalidateBorders() ;
 
     WXWindow            MacGetTopLevelWindowRef() const ;
-    wxTopLevelWindowMac* MacGetTopLevelWindow() const ;
+    wxNonOwnedWindow*   MacGetTopLevelWindow() const ;
 
     virtual long        MacGetLeftBorderSize() const ;
     virtual long        MacGetRightBorderSize() const ;
@@ -195,15 +195,12 @@ public:
     virtual void        MacHiliteChanged() ;
     virtual wxInt32     MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
-    bool                MacIsReallyShown() ;
     bool                MacIsReallyEnabled() ;
     bool                MacIsReallyHilited() ;
 
     bool                MacIsUserPane() { return m_macIsUserPane; }
 
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
-    virtual void        MacSetBackgroundBrush( const wxBrush &brush ) ;
-    const wxBrush&      MacGetBackgroundBrush() const { return m_macBackgroundBrush ; }
 
     // return the rectangle that would be visible of this control,
     // regardless whether controls are hidden
@@ -266,9 +263,6 @@ protected:
     // For controls like radio buttons which are genuinely composite
     wxList              m_subControls;
 
-    // number of calls to Freeze() minus number of calls to Thaw()
-    unsigned int        m_frozenness;
-
     // the peer object, allowing for cleaner API support
     wxMacControl *       m_peer ;
 
@@ -287,7 +281,6 @@ protected:
 
     // true if is is not a native control but a wxWindow control
     bool                m_macIsUserPane ;
-    wxBrush             m_macBackgroundBrush ;
 
     // insets of the mac control from the wx top left corner
     wxPoint             m_macTopLeftInset ;
@@ -312,10 +305,6 @@ protected:
     void                MacRepositionScrollBars() ;
     void                MacUpdateControlFont() ;
 
-    void                MacPropagateVisibilityChanged() ;
-    void                MacPropagateEnabledStateChanged() ;
-    void                MacPropagateHiliteChanged() ;
-
     // implement the base class pure virtuals
     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const;