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

Applied patch #876969: "Fixes to Borland warnings"; Minor code cleanup.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2004-01-27 22:30:13 +00:00
parent 8cc4850c2d
commit d1b20379e4
3 changed files with 83 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/dlgcmn.cpp
View File

@@ -196,7 +196,6 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
#endif
wxButton *ok = (wxButton *) NULL;
wxButton *cancel = (wxButton *) NULL;
wxButton *yes = (wxButton *) NULL;
wxButton *no = (wxButton *) NULL;
@@ -238,7 +237,7 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
if (flags & wxCANCEL)
{
cancel = new wxButton( this, wxID_CANCEL, _("Cancel"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
wxButton *cancel = new wxButton( this, wxID_CANCEL, _("Cancel"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
inner_rest->Add( cancel, 0, wxLEFT|wxRIGHT, margin );
}

22
src/common/framecmn.cpp
View File

@@ -128,20 +128,20 @@ bool wxFrameBase::IsOneOfBars(const wxWindow *win) const
{
#if wxUSE_MENUS
if ( win == GetMenuBar() )
return TRUE;
return true;
#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR
if ( win == GetStatusBar() )
return TRUE;
return true;
#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
if ( win == GetToolBar() )
return TRUE;
return true;
#endif // wxUSE_TOOLBAR
return FALSE;
return false;
}
// ----------------------------------------------------------------------------
@@ -185,7 +185,7 @@ bool wxFrameBase::ProcessCommand(int id)
#if wxUSE_MENUS
wxMenuBar *bar = GetMenuBar();
if ( !bar )
return FALSE;
return false;
wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
commandEvent.SetEventObject(this);
@@ -194,7 +194,7 @@ bool wxFrameBase::ProcessCommand(int id)
if (item)
{
if (!item->IsEnabled())
return TRUE;
return true;
if (item->IsCheckable())
{
@@ -206,9 +206,9 @@ bool wxFrameBase::ProcessCommand(int id)
}
GetEventHandler()->ProcessEvent(commandEvent);
return TRUE;
return true;
#else // !wxUSE_MENUS
return FALSE;
return false;
#endif // wxUSE_MENUS/!wxUSE_MENUS
}
@@ -253,7 +253,11 @@ void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
#endif // wxUSE_STATUSBAR
}
#if !wxUSE_IDLEMENUUPDATES
void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
#else
void wxFrameBase::OnMenuOpen(wxMenuEvent& WXUNUSED(event))
#endif
{
#if !wxUSE_IDLEMENUUPDATES
DoMenuUpdates(event.GetMenu());
@@ -378,7 +382,7 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
return !helpString.IsEmpty();
#else // !wxUSE_MENUS
return FALSE;
return false;
#endif // wxUSE_MENUS/!wxUSE_MENUS
}