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

compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-07-19 22:54:55 +00:00
parent b908d2244a
commit 1ecffbff71
5 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/gtk/menu.h
View File

@@ -120,10 +120,9 @@ public:
#endif #endif
wxMenu( const wxString& title = wxEmptyString, long style = 0 ) wxMenu( const wxString& title = wxEmptyString, long style = 0 )
{ {
Init(title, style, NULL); Init(title, style);
} }
wxMenu( long style );
~wxMenu(); ~wxMenu();
// operations // operations
@@ -203,7 +202,7 @@ private:
void Init( const wxString& title, void Init( const wxString& title,
long style long style
#ifdef WXWIN_COMPATIBILITY #ifdef WXWIN_COMPATIBILITY
, const wxFunction func , const wxFunction func = (wxFunction) NULL
#endif #endif
); );

5
include/wx/gtk1/menu.h
View File

@@ -120,10 +120,9 @@ public:
#endif #endif
wxMenu( const wxString& title = wxEmptyString, long style = 0 ) wxMenu( const wxString& title = wxEmptyString, long style = 0 )
{ {
Init(title, style, NULL); Init(title, style);
} }
wxMenu( long style );
~wxMenu(); ~wxMenu();
// operations // operations
@@ -203,7 +202,7 @@ private:
void Init( const wxString& title, void Init( const wxString& title,
long style long style
#ifdef WXWIN_COMPATIBILITY #ifdef WXWIN_COMPATIBILITY
, const wxFunction func , const wxFunction func = (wxFunction) NULL
#endif #endif
); );

3
samples/minimal/minimal.cpp
View File

@@ -155,8 +155,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
SetIcon(wxICON(mondrian)); SetIcon(wxICON(mondrian));
// create a menu bar // create a menu bar
// wxMenu *menuFile = new wxMenu; wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
wxMenu *menuFile = new wxMenu(wxMENU_TEAROFF);
menuFile->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog"); menuFile->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");
menuFile->Append(Minimal_Test, "&Test...\tCtrl-T", "Test"); menuFile->Append(Minimal_Test, "&Test...\tCtrl-T", "Test");

12
src/gtk/menu.cpp
View File

@@ -626,19 +626,9 @@ bool wxMenuItem::IsChecked() const
IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
wxMenu::wxMenu( const wxString& title, const wxFunction func, long style )
{
Init(title, func, style);
}
wxMenu::wxMenu(long style)
{
Init(wxEmptyString, (wxFunction) NULL, style);
}
void void
wxMenu::Init( const wxString& title, wxMenu::Init( const wxString& title,
long style, long style
#ifdef WXWIN_COMPATIBILITY #ifdef WXWIN_COMPATIBILITY
, const wxFunction func , const wxFunction func
#endif #endif

12
src/gtk1/menu.cpp
View File

@@ -626,19 +626,9 @@ bool wxMenuItem::IsChecked() const
IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
wxMenu::wxMenu( const wxString& title, const wxFunction func, long style )
{
Init(title, func, style);
}
wxMenu::wxMenu(long style)
{
Init(wxEmptyString, (wxFunction) NULL, style);
}
void void
wxMenu::Init( const wxString& title, wxMenu::Init( const wxString& title,
long style, long style
#ifdef WXWIN_COMPATIBILITY #ifdef WXWIN_COMPATIBILITY
, const wxFunction func , const wxFunction func
#endif #endif