wxMac doesn't need UseNativeStatusBar hack
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -87,11 +87,6 @@ public:
|
|||||||
const wxString& name = wxStatusLineNameStr);
|
const wxString& name = wxStatusLineNameStr);
|
||||||
|
|
||||||
virtual void PositionStatusBar();
|
virtual void PositionStatusBar();
|
||||||
|
|
||||||
// Hint to tell framework which status bar to use
|
|
||||||
// TODO: should this go into a wxFrameworkSettings class perhaps?
|
|
||||||
static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
|
|
||||||
static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
|
|
||||||
#endif // wxUSE_STATUSBAR
|
#endif // wxUSE_STATUSBAR
|
||||||
|
|
||||||
// tooltip management
|
// tooltip management
|
||||||
@@ -117,9 +112,6 @@ protected:
|
|||||||
virtual void AttachMenuBar(wxMenuBar *menubar);
|
virtual void AttachMenuBar(wxMenuBar *menubar);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
#if wxUSE_STATUSBAR
|
|
||||||
static bool m_useNativeStatusBar;
|
|
||||||
#endif // wxUSE_STATUSBAR
|
|
||||||
// the last focused child: we restore focus to it on activation
|
// the last focused child: we restore focus to it on activation
|
||||||
wxWindow *m_winLastFocused;
|
wxWindow *m_winLastFocused;
|
||||||
|
|
||||||
|
@@ -40,12 +40,6 @@ END_EVENT_TABLE()
|
|||||||
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
|
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_NATIVE_STATUSBAR
|
|
||||||
bool wxFrame::m_useNativeStatusBar = TRUE;
|
|
||||||
#else
|
|
||||||
bool wxFrame::m_useNativeStatusBar = FALSE;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define WX_MAC_STATUSBAR_HEIGHT 15
|
#define WX_MAC_STATUSBAR_HEIGHT 15
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// creation/destruction
|
// creation/destruction
|
||||||
|
@@ -40,12 +40,6 @@ END_EVENT_TABLE()
|
|||||||
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
|
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_NATIVE_STATUSBAR
|
|
||||||
bool wxFrame::m_useNativeStatusBar = TRUE;
|
|
||||||
#else
|
|
||||||
bool wxFrame::m_useNativeStatusBar = FALSE;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define WX_MAC_STATUSBAR_HEIGHT 15
|
#define WX_MAC_STATUSBAR_HEIGHT 15
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// creation/destruction
|
// creation/destruction
|
||||||
|
Reference in New Issue
Block a user