Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osx regrouping

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-07-29 20:35:29 +00:00
parent 41e5097c52
commit bcb07ff03e
10 changed files with 291 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
include/wx/osx/carbon/nonownedwnd.h
View File

@@ -28,6 +28,8 @@
// location is independent of it. This class is for internal use only, it's
// the base class for wxTopLevelWindow and wxPopupWindow.
class wxNonOwnedWindowImpl;
class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxWindow
{
public:
@@ -65,79 +67,52 @@ public:
virtual bool CanSetTransparent();
virtual bool SetBackgroundStyle(wxBackgroundStyle style);
virtual void Update();
WXWindow GetWXWindow() const ;
static wxNonOwnedWindow* GetFromWXWindow( WXWindow win );
// implementation from now on
// --------------------------
// activation hooks only necessary for MDI Implementation
static void MacDelayedDeactivation(long timestamp);
virtual void MacCreateRealWindow( const wxPoint& pos,
const wxSize& size,
long style,
const wxString& name ) ;
WXWindow MacGetWindowRef() { return m_macWindow ; }
virtual void MacActivate( long timestamp , bool inIsActivating ) ;
virtual void MacPerformUpdates() ;
virtual void Raise();
virtual void Lower();
virtual bool Show( bool show = true );
virtual bool ShowWithEffect(wxShowEffect effect,
unsigned timeout = 0)
{ return MacShowWithEffect(true, effect, timeout); }
unsigned timeout = 0) ;
virtual bool HideWithEffect(wxShowEffect effect,
unsigned timeout = 0)
{ return MacShowWithEffect(false, effect, timeout); }
unsigned timeout = 0) ;
virtual void SetExtraStyle(long exStyle) ;
virtual bool SetBackgroundColour( const wxColour &colour );
virtual void MacInstallTopLevelWindowEventHandler() ;
bool MacGetMetalAppearance() const ;
bool MacGetUnifiedAppearance() const ;
void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
wxUint32 MacGetWindowAttributes() const ;
WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; }
virtual void MacGetContentAreaInset( int &left , int &top , int &right , int &bottom ) ;
wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; }
protected:
// common part of all ctors
void Init();
bool MacShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
virtual void DoGetPosition( int *x, int *y ) const;
virtual void DoGetSize( int *width, int *height ) const;
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void DoGetClientSize(int *width, int *height) const;
WXWindow m_macWindow ;
wxNonOwnedWindowImpl* m_nowpeer ;
wxWindowMac* m_macFocus ;
// wxWindowMac* m_macFocus ;
static wxNonOwnedWindow *s_macDeactivateWindow;
private :
// KH: We cannot let this be called directly since the metal appearance is now managed by an
// extra style. Calling this function directly can result in blank white window backgrounds.
// This is because the ExtraStyle flags get out of sync with the metal appearance and the metal
// logic & checks cease to work as expected. To set the metal appearance, use SetExtraStyle.
void MacSetMetalAppearance( bool on ) ;
void MacSetUnifiedAppearance( bool on ) ;
// binary compatible workaround TODO REPLACE
void DoMacCreateRealWindow( wxWindow *parent,
const wxPoint& pos,
const wxSize& size,
long style,
const wxString& name );
WXEVENTHANDLERREF m_macEventHandler ;
};
// list of all frames and modeless dialogs