fixed header include guard position (patch 992443)

[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 2d2258c7e21c449afa85801bd197e3e55fd3f72d..01b5e495d4934bbd2c9e48d5c9fd6d7f1347df02 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -26,6 +26,10 @@ class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxScrollBar;
 class WXDLLEXPORT wxTopLevelWindowMac;
 
 class WXDLLEXPORT wxScrollBar;
 class WXDLLEXPORT wxTopLevelWindowMac;
 

+// internal implementation classes
+
+class wxMacControl ;
+

 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------


@@ -39,19 +43,14 @@ class WXDLLEXPORT wxWindowMac: public wxWindowBase
     
 public:
     
     
 public:
     

-    wxWindowMac()
-    { Init(); }
+    wxWindowMac() ;

 
     wxWindowMac(wxWindowMac *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
 
     wxWindowMac(wxWindowMac *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,

-                const wxString& name = wxPanelNameStr)
-    {
-        Init();
-        Create(parent, id, pos, size, style, name);
-    }
+                const wxString& name = wxPanelNameStr) ;

 
     virtual ~wxWindowMac();
 
 
     virtual ~wxWindowMac();
 


@@ -131,7 +130,7 @@ public:
     // simple accessors
     // ----------------
 
     // simple accessors
     // ----------------
 

-    virtual WXWidget GetHandle() const { return m_macControl ; }
+    virtual WXWidget GetHandle() const ;

 
 #if WXWIN_COMPATIBILITY_2_4
     bool GetTransparentBackground() const { return m_backgroundTransparent; }
 
 #if WXWIN_COMPATIBILITY_2_4
     bool GetTransparentBackground() const { return m_backgroundTransparent; }


@@ -185,6 +184,7 @@ public:
     virtual void        MacVisibilityChanged() ;
     virtual void        MacEnabledStateChanged() ;
     virtual void        MacHiliteChanged() ;
     virtual void        MacVisibilityChanged() ;
     virtual void        MacEnabledStateChanged() ;
     virtual void        MacHiliteChanged() ;

+    virtual wxInt32     MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

     
     bool                MacIsReallyShown() ;
     bool                MacIsReallyEnabled() ;
     
     bool                MacIsReallyShown() ;
     bool                MacIsReallyEnabled() ;


@@ -195,7 +195,7 @@ public:
     virtual void        Update() ;
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
         
     virtual void        Update() ;
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
         

-    virtual void        MacSetBackgroundBrush( const wxBrush &brush ) { m_macBackgroundBrush = brush ; }
+    virtual void        MacSetBackgroundBrush( const wxBrush &brush ) ;

     const wxBrush&      MacGetBackgroundBrush() const { return m_macBackgroundBrush ; }
     
     // returns the visible region of this control in window ie non-client coordinates
     const wxBrush&      MacGetBackgroundBrush() const { return m_macBackgroundBrush ; }
     
     // returns the visible region of this control in window ie non-client coordinates


@@ -205,7 +205,7 @@ public:
         { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
 
     wxList&             GetSubcontrols() { return m_subControls; }
         { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
 
     wxList&             GetSubcontrols() { return m_subControls; }

-    virtual void               MacInstallEventHandler() ;
+    virtual void               MacInstallEventHandler(WXWidget native) ;

        virtual void            MacRedrawControl();
     WXEVENTHANDLERREF   MacGetControlEventHandler() { return m_macControlEventHandler ; }
     void                MacPostControlCreate(const wxPoint& pos, const wxSize& size) ;
        virtual void            MacRedrawControl();
     WXEVENTHANDLERREF   MacGetControlEventHandler() { return m_macControlEventHandler ; }
     void                MacPostControlCreate(const wxPoint& pos, const wxSize& size) ;


@@ -219,7 +219,7 @@ public:
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;
 
     virtual wxInt16         MacControlUserPaneFocusProc(wxInt16 action) ;
     virtual void            MacControlUserPaneBackgroundProc(void* info) ;
 

-    // translate wxWindows coords into ones suitable to be passed to
+    // translate wxWidgets coords into ones suitable to be passed to

     // the CreateControl calls
     //
     // returns TRUE if non default coords are returned, FALSE otherwise
     // the CreateControl calls
     //
     // returns TRUE if non default coords are returned, FALSE otherwise


@@ -233,15 +233,23 @@ public:
     // gets the inset from every part
     virtual void        MacGetContentAreaInset( int &left , int &top , int &right , int &bottom ) ;
 
     // gets the inset from every part
     virtual void        MacGetContentAreaInset( int &left , int &top , int &right , int &bottom ) ;
 

+    // flash the current invalid area, useful for debugging in OSX double buffered situation
+    void                MacFlashInvalidAreas() ;
+

 protected:
     // For controls like radiobuttons which are really composite
     wxList              m_subControls;
     // number of calls to Freeze() minus number of calls to Thaw()
     unsigned int        m_frozenness;
 protected:
     // For controls like radiobuttons which are really composite
     wxList              m_subControls;
     // number of calls to Freeze() minus number of calls to Thaw()
     unsigned int        m_frozenness;

-    
-    WXWidget            m_macControl ;
+    // the peer object, allowing for cleaner API support
+    wxMacControl*       m_peer ;
+    // true if is is not a native control but a wxWindow control

        bool                            m_macIsUserPane ;
     wxBrush             m_macBackgroundBrush ;
        bool                            m_macIsUserPane ;
     wxBrush             m_macBackgroundBrush ;

+    // topleft inset of the mac control from the wx top left corner
+    wxPoint             m_macTopLeftInset ;
+    // bottom right inset of the mac control from the wx bottom right corner
+    wxPoint             m_macBottomRightInset ;

     
     wxScrollBar*        m_hScrollBar ;
     wxScrollBar*        m_vScrollBar ;
     
     wxScrollBar*        m_hScrollBar ;
     wxScrollBar*        m_vScrollBar ;


@@ -255,7 +263,7 @@ protected:
     void                MacPropagateEnabledStateChanged() ;
     void                MacPropagateHiliteChanged() ;
  
     void                MacPropagateEnabledStateChanged() ;
     void                MacPropagateHiliteChanged() ;
  

-
+    

 #if WXWIN_COMPATIBILITY_2_4
     bool                 m_backgroundTransparent ;
 #endif
 #if WXWIN_COMPATIBILITY_2_4
     bool                 m_backgroundTransparent ;
 #endif