remove wxFindFocusedChild() declaration too as g++ gets upset if an extern function...

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

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 76b9f3410f9ac0d48117d812bdac0885c7bdd716..d2f9a85ca1684564371b761de32649427cfb75a8 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowMac;
 
 class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowMac;
 

-class wxMacControl ;
+class WXDLLIMPEXP_FWD_CORE wxMacControl ;

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


@@ -56,15 +56,14 @@ public:
 
     virtual bool Show( bool show = true );
 
 
     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 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();
 
     virtual void Update() ;
     virtual void ClearBackground();


@@ -86,6 +85,9 @@ protected:
     virtual void DoEnable( bool enable );
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 
     virtual void DoEnable( bool enable );
     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 );
 public:
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = true );


@@ -193,7 +195,6 @@ public:
     virtual void        MacHiliteChanged() ;
     virtual wxInt32     MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
     virtual void        MacHiliteChanged() ;
     virtual wxInt32     MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 

-    bool                MacIsReallyShown() ;

     bool                MacIsReallyEnabled() ;
     bool                MacIsReallyHilited() ;
 
     bool                MacIsReallyEnabled() ;
     bool                MacIsReallyHilited() ;
 


@@ -262,9 +263,6 @@ protected:
     // For controls like radio buttons which are genuinely composite
     wxList              m_subControls;
 
     // 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 ;
 
     // the peer object, allowing for cleaner API support
     wxMacControl *       m_peer ;