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

updated the sample and renamed the files

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-12-13 23:05:56 +00:00
parent fb5ddb4c13
commit fc6bbc6dad
10 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/toolbar/Makefile.in
View File

@@ -13,7 +13,7 @@ top_srcdir = @top_srcdir@
top_builddir = ../.. top_builddir = ../..
program_dir = samples/toolbar program_dir = samples/toolbar
PROGRAM=test PROGRAM=toolbar
OBJECTS=$(PROGRAM).o OBJECTS=$(PROGRAM).o

2
samples/toolbar/makefile.b32
View File

@@ -9,7 +9,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
TARGET=test TARGET=toolbar
OBJECTS = $(TARGET).obj OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.b32 !include $(WXDIR)\src\makeprog.b32

2
samples/toolbar/makefile.bcc
View File

@@ -12,7 +12,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
TARGET=test TARGET=toolbar
OBJECTS=$(TARGET).obj OBJECTS=$(TARGET).obj
!include $(WXDIR)\src\makeprog.bcc !include $(WXDIR)\src\makeprog.bcc

2
samples/toolbar/makefile.dos
View File

@@ -10,7 +10,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
TARGET=test TARGET=toolbar
OBJECTS = $(TARGET).obj OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.msc !include $(WXDIR)\src\makeprog.msc

2
samples/toolbar/makefile.g95
View File

@@ -9,7 +9,7 @@
WXDIR = ../.. WXDIR = ../..
TARGET=test TARGET=toolbar
OBJECTS = $(TARGET).o OBJECTS = $(TARGET).o
include $(WXDIR)/src/makeprog.g95 include $(WXDIR)/src/makeprog.g95

2
samples/toolbar/makefile.vc
View File

@@ -11,7 +11,7 @@
# Set WXDIR for your system # Set WXDIR for your system
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
PROGRAM=test PROGRAM=toolbar
OBJECTS = $(PROGRAM).obj OBJECTS = $(PROGRAM).obj
!include $(WXDIR)\src\makeprog.vc !include $(WXDIR)\src\makeprog.vc

2
samples/toolbar/makefile.wat
View File

@@ -7,7 +7,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = test PROGRAM = toolbar
OBJECTS = $(PROGRAM).obj OBJECTS = $(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

28
samples/toolbar/test.cpp → samples/toolbar/toolbar.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: test.cpp // Name: toolbar.cpp
// Purpose: wxToolBar sample // Purpose: wxToolBar sample
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -214,8 +214,6 @@ bool MyApp::InitToolbar(wxToolBar* toolBar, bool smallicons)
toolBar->AddTool(wxID_NEW, *(toolBarBitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "New file"); toolBar->AddTool(wxID_NEW, *(toolBarBitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "New file");
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");
currentX += width + 5;
toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Toggle button 1");
wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO); wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO);
combo->Append("This"); combo->Append("This");
@@ -227,6 +225,8 @@ bool MyApp::InitToolbar(wxToolBar* toolBar, bool smallicons)
if ( !smallicons ) if ( !smallicons )
{ {
currentX += width + 5;
toolBar->AddTool(wxID_SAVE, *(toolBarBitmaps[2]), wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Toggle button 1");
currentX += width + 5; currentX += width + 5;
toolBar->AddTool(wxID_COPY, *(toolBarBitmaps[3]), wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Toggle button 2"); toolBar->AddTool(wxID_COPY, *(toolBarBitmaps[3]), wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Toggle button 2");
currentX += width + 5; currentX += width + 5;
@@ -243,7 +243,7 @@ bool MyApp::InitToolbar(wxToolBar* toolBar, bool smallicons)
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 = smallicons ? 3 : 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];
@@ -274,11 +274,11 @@ MyFrame::MyFrame(wxFrame* parent,
// Make a menubar // Make a menubar
wxMenu *tbarMenu = new wxMenu; wxMenu *tbarMenu = new wxMenu;
tbarMenu->Append(IDM_TOOLBAR_TOGGLETOOLBAR, "&Toggle toolbar", "Change the toolbar kind"); tbarMenu->Append(IDM_TOOLBAR_TOGGLETOOLBAR, "&Toggle toolbar\tCtrl-T", "Change the toolbar kind");
tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, "&Enable print button", ""); tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, "&Enable print button\tCtrl-E", "");
tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, "&Delete print button", ""); tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, "&Delete print button\tCtrl-D", "");
tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, "&Insert print button", ""); tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, "&Insert print button\tCtrl-I", "");
tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, "Toggle &help button", ""); tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, "Toggle &help button\tCtrl-T", "");
wxMenu *fileMenu = new wxMenu; wxMenu *fileMenu = new wxMenu;
fileMenu->Append(wxID_EXIT, "E&xit", "Quit toolbar sample" ); fileMenu->Append(wxID_EXIT, "E&xit", "Quit toolbar sample" );
@@ -378,12 +378,7 @@ void MyFrame::DoDeletePrint()
{ {
wxToolBar *tb = GetToolBar(); wxToolBar *tb = GetToolBar();
// only implemented in wxGTK and wxMSW for now
#if !defined(__WXGTK__) && !defined(__WXMSW__)
wxMessageBox("Sorry, wxToolBar::DeleteTool is not implemented.");
#else
tb->DeleteTool( wxID_PRINT ); tb->DeleteTool( wxID_PRINT );
#endif
} }
void MyFrame::DoToggleHelp() void MyFrame::DoToggleHelp()
@@ -400,9 +395,8 @@ void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
wxBitmap bmp(print_xpm); wxBitmap bmp(print_xpm);
#endif #endif
GetToolBar()->AddTool(wxID_PRINT, bmp, wxNullBitmap, GetToolBar()->InsertTool(0, wxID_PRINT, bmp, wxNullBitmap,
FALSE, 0, -1, FALSE, (wxObject *) NULL, "Delete this tool");
(wxObject *) NULL, "Delete this tool");
GetToolBar()->Realize(); GetToolBar()->Realize();
} }

0
samples/toolbar/test.def → samples/toolbar/toolbar.def
View File

0
samples/toolbar/test.rc → samples/toolbar/toolbar.rc
View File