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

fix warning about unused variable in wxWinCE build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-04 21:12:31 +00:00
parent 1c07cf50cb
commit 8898842fdc
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/frame.cpp
View File

@@ -623,16 +623,13 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
void wxFrame::PositionToolBar() void wxFrame::PositionToolBar()
{ {
int x = 0, y = 0; // TODO: we want to do something different in WinCE, because the toolbar
// should be associated with the commandbar, instead of being
// independent window.
#if !defined(WINCE_WITHOUT_COMMANDBAR)
wxToolBar *toolbar = GetToolBar(); wxToolBar *toolbar = GetToolBar();
if ( toolbar && toolbar->IsShown() ) if ( toolbar && toolbar->IsShown() )
{ {
#if defined(WINCE_WITHOUT_COMMANDBAR)
// We want to do something different in WinCE, because
// the toolbar should be associated with the commandbar,
// and not an independent window.
// TODO
#else
// don't call our (or even wxTopLevelWindow) version because we want // don't call our (or even wxTopLevelWindow) version because we want
// the real (full) client area size, not excluding the tool/status bar // the real (full) client area size, not excluding the tool/status bar
int width, height; int width, height;
@@ -650,6 +647,7 @@ void wxFrame::PositionToolBar()
toolbar->GetPosition( &tx, &ty ); toolbar->GetPosition( &tx, &ty );
toolbar->GetSize( &tw, &th ); toolbar->GetSize( &tw, &th );
int x = 0, y = 0;
if ( toolbar->HasFlag(wxTB_BOTTOM) ) if ( toolbar->HasFlag(wxTB_BOTTOM) )
{ {
x = 0; x = 0;
@@ -742,8 +740,8 @@ void wxFrame::PositionToolBar()
if (tx != 0 || ty != 0 || widthChanging || heightChanging) if (tx != 0 || ty != 0 || widthChanging || heightChanging)
toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS); toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
#endif // __WXWINCE__
} }
#endif // !WINCE_WITH_COMMANDBAR
} }
#endif // wxUSE_TOOLBAR #endif // wxUSE_TOOLBAR