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

Don't test whether wxTopLevelWindowNative is defined.

Browse Source 
It seems to be defined for all ports now so there is no need to check whether it is.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-07-31 12:17:12 +00:00
parent 49899527ff
commit 77497ea37e
2 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/frame.h
View File

@ -169,17 +169,6 @@ public:
// Implement internal behaviour (menu updating on some platforms)
virtual void OnInternalIdle();
// if there is no real wxTopLevelWindow on this platform we have to define
// some wxTopLevelWindowBase pure virtual functions here to avoid breaking
// old ports (wxMotif) which don't define them in wxFrame
#ifndef wxTopLevelWindowNative
virtual bool ShowFullScreen(bool WXUNUSED(show),
long WXUNUSED(style) = wxFULLSCREEN_ALL)
{ return false; }
virtual bool IsFullScreen() const
{ return false; }
#endif // no wxTopLevelWindowNative
#if wxUSE_MENUS || wxUSE_TOOLBAR
// show help text for the currently selected menu or toolbar item
// (typically in the status bar) or hide it and restore the status bar text

37
include/wx/toplevel.h
View File

@ -344,28 +344,25 @@ protected:
#ifdef __WXUNIVERSAL__
#include "wx/univ/toplevel.h"
#else // !__WXUNIVERSAL__
#ifdef wxTopLevelWindowNative
class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative
class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative
{
public:
// construction
wxTopLevelWindow() { }
wxTopLevelWindow(wxWindow *parent,
wxWindowID winid,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
: wxTopLevelWindowNative(parent, winid, title,
pos, size, style, name)
{
public:
// construction
wxTopLevelWindow() { }
wxTopLevelWindow(wxWindow *parent,
wxWindowID winid,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
: wxTopLevelWindowNative(parent, winid, title,
pos, size, style, name)
{
}
}
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTopLevelWindow)
};
#endif // wxTopLevelWindowNative
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTopLevelWindow)
};
#endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
#endif // _WX_TOPLEVEL_BASE_H_