forward port from 2.8
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -60,6 +60,9 @@ public:
|
|||||||
virtual bool IsMaximized() const;
|
virtual bool IsMaximized() const;
|
||||||
virtual void Iconize(bool iconize = true);
|
virtual void Iconize(bool iconize = true);
|
||||||
virtual bool IsIconized() const;
|
virtual bool IsIconized() const;
|
||||||
|
#ifndef __WXUNIVERSAL__
|
||||||
|
virtual void SetIcons(const wxIconBundle& icons);
|
||||||
|
#endif
|
||||||
virtual void Restore();
|
virtual void Restore();
|
||||||
|
|
||||||
virtual bool SetShape(const wxRegion& region);
|
virtual bool SetShape(const wxRegion& region);
|
||||||
@@ -118,6 +121,7 @@ protected:
|
|||||||
virtual void DoGetSize( int *width, int *height ) const;
|
virtual void DoGetSize( int *width, int *height ) const;
|
||||||
virtual void DoMoveWindow(int x, int y, int width, int height);
|
virtual void DoMoveWindow(int x, int y, int width, int height);
|
||||||
virtual void DoGetClientSize(int *width, int *height) const;
|
virtual void DoGetClientSize(int *width, int *height) const;
|
||||||
|
virtual void DoCentre(int dir);
|
||||||
|
|
||||||
// is the frame currently iconized?
|
// is the frame currently iconized?
|
||||||
bool m_iconized;
|
bool m_iconized;
|
||||||
@@ -139,6 +143,12 @@ private :
|
|||||||
// logic & checks cease to work as expected. To set the metal appearance, use SetExtraStyle.
|
// logic & checks cease to work as expected. To set the metal appearance, use SetExtraStyle.
|
||||||
void MacSetMetalAppearance( bool on ) ;
|
void MacSetMetalAppearance( bool on ) ;
|
||||||
void MacSetUnifiedAppearance( bool on ) ;
|
void MacSetUnifiedAppearance( bool on ) ;
|
||||||
|
// binary compatible workaround TODO REPLACE
|
||||||
|
void DoMacCreateRealWindow( wxWindow *parent, const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
long style,
|
||||||
|
const wxString& name );
|
||||||
|
|
||||||
WXEVENTHANDLERREF m_macEventHandler ;
|
WXEVENTHANDLERREF m_macEventHandler ;
|
||||||
|
|
||||||
@@ -146,6 +156,6 @@ private :
|
|||||||
};
|
};
|
||||||
|
|
||||||
// list of all frames and modeless dialogs
|
// list of all frames and modeless dialogs
|
||||||
extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
|
extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
|
||||||
|
|
||||||
#endif // _WX_MSW_TOPLEVEL_H_
|
#endif // _WX_MSW_TOPLEVEL_H_
|
||||||
|
Reference in New Issue
Block a user