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

WinCE fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-07-13 12:42:02 +00:00
parent 1ab36908f9
commit 16640ba226
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/wince/tbarwce.cpp
View File

@@ -226,11 +226,11 @@ bool wxToolBar::Create(wxWindow *parent,
{ {
// common initialisation // common initialisation
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE; return false;
// MSW-specific initialisation // MSW-specific initialisation
if ( !MSWCreateToolbar(pos, size, menuBar) ) if ( !MSWCreateToolbar(pos, size, menuBar) )
return FALSE; return false;
// set up the colors and fonts // set up the colors and fonts
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR)); SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
@@ -243,7 +243,7 @@ bool wxToolBar::Create(wxWindow *parent,
#define TBSTYLE_NO_DROPDOWN_ARROW 0x0080 #define TBSTYLE_NO_DROPDOWN_ARROW 0x0080
#endif #endif
bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size, wxMenuBar* menuBar) bool wxToolBar::MSWCreateToolbar(const wxPoint& WXUNUSED(pos), const wxSize& WXUNUSED(size), wxMenuBar* menuBar)
{ {
SetMenuBar(menuBar); SetMenuBar(menuBar);
if (m_menuBar) if (m_menuBar)
@@ -269,7 +269,7 @@ bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size, wxMenuB
if (!SHCreateMenuBar(&mbi)) if (!SHCreateMenuBar(&mbi))
{ {
wxFAIL_MSG( _T("SHCreateMenuBar failed") ); wxFAIL_MSG( _T("SHCreateMenuBar failed") );
return FALSE; return false;
} }
SetHWND((WXHWND) mbi.hwndMB); SetHWND((WXHWND) mbi.hwndMB);
@@ -494,7 +494,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
{ {
wxLogLastError(wxT("TB_DELETEBUTTON")); wxLogLastError(wxT("TB_DELETEBUTTON"));
return FALSE; return false;
} }
} }
@@ -600,7 +600,7 @@ bool wxToolBar::Realize()
// this array will hold the indices of all controls in the toolbar // this array will hold the indices of all controls in the toolbar
wxArrayInt controlIds; wxArrayInt controlIds;
bool lastWasRadio = FALSE; bool lastWasRadio = false;
int i = 0; int i = 0;
wxToolBarToolsList::Node* node; wxToolBarToolsList::Node* node;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
@@ -613,7 +613,7 @@ bool wxToolBar::Realize()
wxZeroMemory(button); wxZeroMemory(button);
bool isRadio = FALSE; bool isRadio = false;
switch ( tool->GetStyle() ) switch ( tool->GetStyle() )
{ {
case wxTOOL_STYLE_CONTROL: case wxTOOL_STYLE_CONTROL:
@@ -646,7 +646,7 @@ bool wxToolBar::Realize()
button.iBitmap = winceId; button.iBitmap = winceId;
} }
else else
processedThis = FALSE; processedThis = false;
if ( tool->IsEnabled() ) if ( tool->IsEnabled() )
button.fsState |= TBSTATE_ENABLED; button.fsState |= TBSTATE_ENABLED;