Don't use "Cancel" button in the about dialog of the listctrl sample.

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

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 133b6d8fc96f1156620a606c4f73b9ba49250179..3cfa8817f21bcf2da4c5856055bef411e93fcd10 100644 (file)
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/mac/carbon/window.h
+// Name:        wx/osx/window.h

 // Purpose:     wxWindowMac class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxWindowMac class
 // Author:      Stefan Csomor
 // Modified by:


@@ -17,10 +17,17 @@
 
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxScrollBar;

+class WXDLLIMPEXP_FWD_CORE wxPanel;

 class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
 
 class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
 

-class WXDLLIMPEXP_FWD_CORE wxMacControl ;
-class WXDLLIMPEXP_FWD_CORE wxWidgetImpl ;
+#if wxOSX_USE_CARBON
+    class WXDLLIMPEXP_FWD_CORE wxMacControl ;
+    typedef wxMacControl wxOSXWidgetImpl;
+#elif wxOSX_USE_COCOA_OR_IPHONE
+    class WXDLLIMPEXP_FWD_CORE wxWidgetImpl ;
+    typedef wxWidgetImpl wxOSXWidgetImpl;
+#endif
+

 
 class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase
 {
 
 class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase
 {


@@ -56,6 +63,16 @@ public:
     virtual void Lower();
 
     virtual bool Show( bool show = true );
     virtual void Lower();
 
     virtual bool Show( bool show = true );

+    virtual bool ShowWithEffect(wxShowEffect effect,
+                                unsigned timeout = 0)
+    {
+        return OSXShowWithEffect(true, effect, timeout);
+    }
+    virtual bool HideWithEffect(wxShowEffect effect,
+                                unsigned timeout = 0)
+    {
+        return OSXShowWithEffect(false, effect, timeout);
+    }

 
     virtual bool IsShownOnScreen() const;
 
 
     virtual bool IsShownOnScreen() const;
 


@@ -74,22 +91,10 @@ public:
     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual bool SetForegroundColour( const wxColour &colour );
 
     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual bool SetForegroundColour( const wxColour &colour );
 

+    virtual bool SetBackgroundStyle(wxBackgroundStyle style);
+

     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;

-    virtual void GetTextExtent( const wxString& string,
-                               int *x, int *y,
-                               int *descent = NULL,
-                               int *externalLeading = NULL,
-                               const wxFont *theFont = NULL )
-                               const;
-protected:
-    virtual void DoEnable( bool enable );
-#if wxUSE_MENUS
-    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
-#endif
-
-    virtual void DoFreeze();
-    virtual void DoThaw();

 
 public:
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
 
 public:
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,


@@ -109,6 +114,14 @@ public:
 
     virtual bool Reparent( wxWindowBase *newParent );
 
 
     virtual bool Reparent( wxWindowBase *newParent );
 

+#if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
+    // hot keys (system wide accelerators)
+    // -----------------------------------
+    
+    virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode);
+    virtual bool UnregisterHotKey(int hotkeyId);
+#endif // wxUSE_HOTKEY
+    

 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
 #endif
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
 #endif


@@ -138,9 +151,7 @@ public:
 
     // event handlers
     // --------------
 
     // event handlers
     // --------------

-    void OnPaint( wxPaintEvent& event );
-    void OnNcPaint( wxNcPaintEvent& event );
-    void OnEraseBackground(wxEraseEvent& event );
+

     void OnMouseEvent( wxMouseEvent &event );
 
     void MacOnScroll( wxScrollEvent&event );
     void OnMouseEvent( wxMouseEvent &event );
 
     void MacOnScroll( wxScrollEvent&event );


@@ -153,8 +164,6 @@ public:
     static long         MacRemoveBordersFromStyle( long style ) ;
 
 public:
     static long         MacRemoveBordersFromStyle( long style ) ;
 
 public:

-    void OnInternalIdle();
-

     // For implementation purposes:
     // sometimes decorations make the client area smaller
     virtual wxPoint GetClientAreaOrigin() const;
     // For implementation purposes:
     // sometimes decorations make the client area smaller
     virtual wxPoint GetClientAreaOrigin() const;


@@ -162,12 +171,13 @@ public:
     wxWindowMac *FindItem(long id) const;
     wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     wxWindowMac *FindItem(long id) const;
     wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 

-    virtual void        MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
-    virtual bool        MacDoRedraw( void* updatergn , long time ) ;
-
-    // this should not be overriden in classes above wxWindowMac
+    virtual void        TriggerScrollEvent( wxEventType scrollEvent ) ;
+    // this should not be overridden in classes above wxWindowMac

     // because it is called from its destructor via DeleteChildren
     virtual void        RemoveChild( wxWindowBase *child );
     // 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();
 


@@ -178,6 +188,7 @@ public:
     WXWindow            MacGetTopLevelWindowRef() const ;
     wxNonOwnedWindow*   MacGetTopLevelWindow() const ;
 
     WXWindow            MacGetTopLevelWindowRef() const ;
     wxNonOwnedWindow*   MacGetTopLevelWindow() const ;
 

+    virtual long        MacGetWXBorderSize() const;

     virtual long        MacGetLeftBorderSize() const ;
     virtual long        MacGetRightBorderSize() const ;
     virtual long        MacGetTopBorderSize() const ;
     virtual long        MacGetLeftBorderSize() const ;
     virtual long        MacGetRightBorderSize() const ;
     virtual long        MacGetTopBorderSize() const ;


@@ -197,7 +208,10 @@ public:
     bool                MacIsReallyEnabled() ;
     bool                MacIsReallyHilited() ;
 
     bool                MacIsReallyEnabled() ;
     bool                MacIsReallyHilited() ;
 

-    bool                MacIsUserPane() { return m_macIsUserPane; }
+#if WXWIN_COMPATIBILITY_2_8
+    bool                MacIsUserPane();
+#endif
+    bool                MacIsUserPane() const;

 
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
 
 
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
 


@@ -223,7 +237,7 @@ public:
     { return ((wxWindow*)m_hScrollBar == sb || (wxWindow*)m_vScrollBar == sb) ; }
     virtual bool IsClientAreaChild(const wxWindow *child) const
     {
     { return ((wxWindow*)m_hScrollBar == sb || (wxWindow*)m_vScrollBar == sb) ; }
     virtual bool IsClientAreaChild(const wxWindow *child) const
     {

-        return !MacIsWindowScrollbar(child) &&
+        return !MacIsWindowScrollbar(child) && !((wxWindow*)m_growBox==child) &&

                wxWindowBase::IsClientAreaChild(child);
     }
 
                wxWindowBase::IsClientAreaChild(child);
     }
 


@@ -240,28 +254,53 @@ public:
                                            int& w, int& h , bool adjustForOrigin ) const ;
 
     // the 'true' OS level control for this wxWindow
                                            int& w, int& h , bool adjustForOrigin ) const ;
 
     // the 'true' OS level control for this wxWindow

-#if wxOSX_USE_CARBON
-    wxMacControl*       GetPeer() const { return m_peer ; }
-#else
-    wxWidgetImpl*       GetPeer() const { return m_peer ; }
-#endif
- 
+    wxOSXWidgetImpl*    GetPeer() const;
+    
+    // optimization to avoid creating a user pane in wxWindow::Create if we already know
+    // we will replace it with our own peer
+    void                DontCreatePeer();
+
+    // return true unless DontCreatePeer() had been called
+    bool                ShouldCreatePeer() const;
+
+    // sets the native implementation wrapper, can replace an existing peer, use peer = NULL to 
+    // release existing peer
+    void                SetPeer(wxOSXWidgetImpl* peer);
+    
+    // wraps the already existing peer with the wrapper
+    void                SetWrappingPeer(wxOSXWidgetImpl* wrapper);
+
+#if wxOSX_USE_COCOA_OR_IPHONE
+    // the NSView or NSWindow of this window: can be used for both child and
+    // non-owned windows
+    //
+    // this is useful for a few Cocoa function which can work with either views
+    // or windows indiscriminately, e.g. for setting NSViewAnimationTargetKey
+    virtual void *OSXGetViewOrWindow() const { return GetHandle(); }
+#endif // Cocoa
+

     void *              MacGetCGContextRef() { return m_cgContextRef ; }
     void                MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }
 
     // osx specific event handling common for all osx-ports
     void *              MacGetCGContextRef() { return m_cgContextRef ; }
     void                MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }
 
     // osx specific event handling common for all osx-ports

+
+    virtual bool        OSXHandleClicked( double timestampsec );
+    virtual bool        OSXHandleKeyEvent( wxKeyEvent& event );
+    virtual void        OSXSimulateFocusEvents();
+
+    bool                IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; }
+    
+    float               GetContentScaleFactor() const ;

     
     

-    virtual bool        HandleClicked( double timestampsec );
+    // internal response to size events
+    virtual void MacOnInternalSize() {}
+

 protected:
     // For controls like radio buttons which are genuinely composite
     wxList              m_subControls;
 
 protected:
     // For controls like radio buttons which are genuinely composite
     wxList              m_subControls;
 

-#if wxOSX_USE_CARBON

     // the peer object, allowing for cleaner API support
     // the peer object, allowing for cleaner API support

-    wxMacControl *       m_peer ;
-#else
-    wxWidgetImpl *       m_peer ;
-#endif
+

     void *              m_cgContextRef ;
 
     // cache the clipped rectangles within the window hierarchy
     void *              m_cgContextRef ;
 
     // cache the clipped rectangles within the window hierarchy


@@ -275,9 +314,6 @@ protected:
     mutable wxRegion    m_cachedClippedRegion ;
     mutable wxRegion    m_cachedClippedClientRegion ;
 
     mutable wxRegion    m_cachedClippedRegion ;
     mutable wxRegion    m_cachedClippedClientRegion ;
 

-    // true if is is not a native control but a wxWindow control
-    bool                m_macIsUserPane ;
-

     // insets of the mac control from the wx top left corner
     wxPoint             m_macTopLeftInset ;
     wxPoint             m_macBottomRightInset ;
     // insets of the mac control from the wx top left corner
     wxPoint             m_macTopLeftInset ;
     wxPoint             m_macBottomRightInset ;


@@ -287,8 +323,11 @@ protected:
     wxScrollBar*        m_vScrollBar ;
     bool                m_hScrollBarAlwaysShown;
     bool                m_vScrollBarAlwaysShown;
     wxScrollBar*        m_vScrollBar ;
     bool                m_hScrollBarAlwaysShown;
     bool                m_vScrollBarAlwaysShown;

+    wxWindow*           m_growBox ;

     wxString            m_label ;
 
     wxString            m_label ;
 

+    bool                m_isNativeWindowWrapper;
+

     // set to true if we do a sharp clip at the content area of this window
     // must be dynamic as eg a panel normally is not clipping precisely, but if
     // it becomes the target window of a scrolled window it has to...
     // set to true if we do a sharp clip at the content area of this window
     // must be dynamic as eg a panel normally is not clipping precisely, but if
     // it becomes the target window of a scrolled window it has to...


@@ -302,6 +341,20 @@ protected:
     void                MacUpdateControlFont() ;
 
     // implement the base class pure virtuals
     void                MacUpdateControlFont() ;
 
     // implement the base class pure virtuals

+    virtual void DoGetTextExtent(const wxString& string,
+                                 int *x, int *y,
+                                 int *descent = NULL,
+                                 int *externalLeading = NULL,
+                                 const wxFont *theFont = NULL ) const;
+
+    virtual void DoEnable( bool enable );
+#if wxUSE_MENUS
+    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
+#endif
+
+    virtual void DoFreeze();
+    virtual void DoThaw();
+

     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const;
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const;
     virtual void DoClientToScreen( int *x, int *y ) const;


@@ -328,7 +381,13 @@ protected:
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif
 
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif
 

+    // common part of Show/HideWithEffect()
+    virtual bool OSXShowWithEffect(bool show,
+                                   wxShowEffect effect,
+                                   unsigned timeout);
+

 private:
 private:

+    wxOSXWidgetImpl *   m_peer ;

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 


@@ -336,8 +395,7 @@ private:
     // AlwaysShowScrollbars()
     void DoUpdateScrollbarVisibility();
 
     // AlwaysShowScrollbars()
     void DoUpdateScrollbarVisibility();
 

-
-    DECLARE_NO_COPY_CLASS(wxWindowMac)
+    wxDECLARE_NO_COPY_CLASS(wxWindowMac);

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };