X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82f8ea8547dca786d909485596215b7542931288..f5fac4471b361f54ae6a09f6047ae4dbe30fcb86:/include/wx/osx/window.h?ds=sidebyside diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h index 51f34e91d7..757455f813 100644 --- 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: @@ -91,6 +91,8 @@ public: 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; @@ -112,6 +114,14 @@ public: 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 @@ -154,8 +164,6 @@ public: static long MacRemoveBordersFromStyle( long style ) ; public: - void OnInternalIdle(); - // For implementation purposes: // sometimes decorations make the client area smaller virtual wxPoint GetClientAreaOrigin() const; @@ -164,7 +172,7 @@ public: wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const; virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; - // this should not be overriden in classes above wxWindowMac + // this should not be overridden in classes above wxWindowMac // because it is called from its destructor via DeleteChildren virtual void RemoveChild( wxWindowBase *child ); @@ -180,6 +188,7 @@ public: WXWindow MacGetTopLevelWindowRef() const ; wxNonOwnedWindow* MacGetTopLevelWindow() const ; + virtual long MacGetWXBorderSize() const; virtual long MacGetLeftBorderSize() const ; virtual long MacGetRightBorderSize() const ; virtual long MacGetTopBorderSize() const ; @@ -200,9 +209,9 @@ public: bool MacIsReallyHilited() ; #if WXWIN_COMPATIBILITY_2_8 - bool MacIsUserPane() { return m_macIsUserPane; } + bool MacIsUserPane(); #endif - bool MacIsUserPane() const { return m_macIsUserPane; } + bool MacIsUserPane() const; virtual bool MacSetupCursor( const wxPoint& pt ) ; @@ -245,7 +254,18 @@ public: int& w, int& h , bool adjustForOrigin ) const ; // the 'true' OS level control for this wxWindow - wxOSXWidgetImpl* GetPeer() const { return m_peer ; } + 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(); + + // 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 @@ -263,12 +283,19 @@ public: virtual bool OSXHandleClicked( double timestampsec ); virtual bool OSXHandleKeyEvent( wxKeyEvent& event ); + + bool IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; } + + float GetContentScaleFactor() const ; + + // internal response to size events + virtual void MacOnInternalSize() {} + protected: // For controls like radio buttons which are genuinely composite wxList m_subControls; // the peer object, allowing for cleaner API support - wxOSXWidgetImpl * m_peer ; void * m_cgContextRef ; @@ -283,9 +310,6 @@ protected: 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 ; @@ -298,6 +322,8 @@ protected: wxWindow* m_growBox ; 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... @@ -357,6 +383,7 @@ protected: unsigned timeout); private: + wxOSXWidgetImpl * m_peer ; // common part of all ctors void Init();