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

Parameter "small" renamed. Defined in a header file

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (JL)
1999-10-04 11:28:23 +00:00
parent d57bf68500
commit d676ebcf25
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/toolbar/test.cpp
View File

@@ -95,7 +95,7 @@ bool MyApp::OnInit()
return TRUE; return TRUE;
} }
bool MyApp::InitToolbar(wxToolBar* toolBar, bool small) bool MyApp::InitToolbar(wxToolBar* toolBar, bool smallicons)
{ {
// Set up toolbar // Set up toolbar
wxBitmap* toolBarBitmaps[8]; wxBitmap* toolBarBitmaps[8];
@@ -103,7 +103,7 @@ bool MyApp::InitToolbar(wxToolBar* toolBar, bool small)
#ifdef __WXMSW__ #ifdef __WXMSW__
toolBarBitmaps[0] = new wxBitmap("icon1"); toolBarBitmaps[0] = new wxBitmap("icon1");
toolBarBitmaps[1] = new wxBitmap("icon2"); toolBarBitmaps[1] = new wxBitmap("icon2");
if ( !small ) if ( !smallicons )
{ {
toolBarBitmaps[2] = new wxBitmap("icon3"); toolBarBitmaps[2] = new wxBitmap("icon3");
toolBarBitmaps[3] = new wxBitmap("icon4"); toolBarBitmaps[3] = new wxBitmap("icon4");
@@ -115,7 +115,7 @@ bool MyApp::InitToolbar(wxToolBar* toolBar, bool small)
#else #else
toolBarBitmaps[0] = new wxBitmap( new_xpm ); toolBarBitmaps[0] = new wxBitmap( new_xpm );
toolBarBitmaps[1] = new wxBitmap( open_xpm ); toolBarBitmaps[1] = new wxBitmap( open_xpm );
if ( !small ) if ( !smallicons )
{ {
toolBarBitmaps[2] = new wxBitmap( save_xpm ); toolBarBitmaps[2] = new wxBitmap( save_xpm );
toolBarBitmaps[3] = new wxBitmap( copy_xpm ); toolBarBitmaps[3] = new wxBitmap( copy_xpm );
@@ -137,7 +137,7 @@ bool MyApp::InitToolbar(wxToolBar* toolBar, bool small)
currentX += width + 5; currentX += width + 5;
toolBar->AddTool(wxID_OPEN, *(toolBarBitmaps[1]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open file"); toolBar->AddTool(wxID_OPEN, *(toolBarBitmaps[1]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open file");
if ( !small ) if ( !smallicons )
{ {
currentX += width + 5; currentX += width + 5;
toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Save file"); toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Save file");
@@ -161,7 +161,7 @@ bool MyApp::InitToolbar(wxToolBar* toolBar, bool small)
toolBar->Realize(); toolBar->Realize();
// Can delete the bitmaps since they're reference counted // Can delete the bitmaps since they're reference counted
int i, max = small ? 2 : WXSIZEOF(toolBarBitmaps); int i, max = smallicons ? 2 : WXSIZEOF(toolBarBitmaps);
for (i = 0; i < max; i++) for (i = 0; i < max; i++)
delete toolBarBitmaps[i]; delete toolBarBitmaps[i];

2
samples/toolbar/test.h
View File

@@ -14,7 +14,7 @@ class MyApp: public wxApp
{ {
public: public:
bool OnInit(); bool OnInit();
bool InitToolbar(wxToolBar* toolBar, bool small = FALSE); bool InitToolbar(wxToolBar* toolBar, bool smallicons = FALSE);
}; };
// Define a new frame // Define a new frame