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

wxUniv compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-10 12:25:46 +00:00
parent 7c36b6a2a1
commit 6522713c75
37 changed files with 170 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/msw/frame.h
View File

@@ -50,7 +50,6 @@ public:
virtual void Iconize(bool iconize = TRUE);
virtual bool IsIconized() const;
virtual void Restore();
virtual void SetMenuBar(wxMenuBar *menubar);
virtual void SetIcon(const wxIcon& icon);
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool IsFullScreen() const { return m_fsIsShowing; };
@@ -134,10 +133,10 @@ protected:
virtual void DoSetClientSize(int width, int height);
// helper
void DetachMenuBar();
#if wxUSE_MENUS_NATIVE
// perform MSW-specific action when menubar is changed
virtual void AttachMenuBar(wxMenuBar *menubar);
// a plug in for MDI frame classes which need to do something special when
// the menubar is set
virtual void InternalSetMenuBar();

8
include/wx/msw/window.h
View File

@@ -28,14 +28,6 @@
// a better solution should be found later...
#define wxUSE_MOUSEEVENT_HACK 0
// when building wxUniv/MSW we don't want the code for native menu use to be
// compiled in - it should only be used when building real wxMSW
#ifdef __WXUNIVERSAL__
#define wxUSE_MENUS_NATIVE 0
#else // __WXMSW__
#define wxUSE_MENUS_NATIVE wxUSE_MENUS
#endif // __WXUNIVERSAL__/__WXMSW__
// ---------------------------------------------------------------------------
// constants
// ---------------------------------------------------------------------------