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

Added bitmaps and icons to samples

Browse Source 
Fixed event handling in all controls
  Add some missing functions to wxRadioBox
  Fixed clientData stuff to Choice (Combo?)
  No more gtk warning in Combo
  Fixed toolbar sample and mdi sample
  Fixed bug in AddChild resulting from mdi changes
  Fixed wxFrame::GetPosition()
  Changed order of notification calls in wxListCtrl
  to prevent what I think is a reentry bug
  The usual compile fixes here and there


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-07-31 20:04:04 +00:00
parent 110f32055e
commit 47908e25f9
62 changed files with 1352 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
samples/mdi/mdi.cpp
View File

@@ -24,9 +24,19 @@
#include <wx/toolbar.h>
#ifdef __WXGTK__
#include "folder.xpm"
#include "mondrian.xpm"
#include "bitmaps/new.xpm"
#include "bitmaps/open.xpm"
#include "bitmaps/save.xpm"
#include "bitmaps/copy.xpm"
#include "bitmaps/cut.xpm"
// #include "bitmaps/paste.xpm"
#include "bitmaps/print.xpm"
#include "bitmaps/preview.xpm"
#include "bitmaps/help.xpm"
#endif
#include "mdi.h"
MyFrame *frame = NULL;
@@ -52,9 +62,6 @@ bool MyApp::OnInit(void)
#ifdef __WXMSW__
frame->SetIcon(wxIcon("mdi_icn"));
#endif
#ifdef __X__
frame->SetIcon(wxIcon("aiai.xbm"));
#endif
// Make a menubar
wxMenu *file_menu = new wxMenu;
@@ -136,9 +143,8 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
// Give it an icon (this is ignored in MDI mode: uses resources)
#ifdef __WXMSW__
subframe->SetIcon(wxIcon("chrt_icn"));
#endif
#ifdef __X__
subframe->SetIcon(wxIcon("aiai.xbm"));
#else
subframe->SetIcon(wxIcon(mondrian_xpm));
#endif
// Give it a status line
@@ -311,14 +317,15 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
bitmaps[6] = new wxBitmap("icon7", wxBITMAP_TYPE_RESOURCE);
bitmaps[7] = new wxBitmap("icon8", wxBITMAP_TYPE_RESOURCE);
#else
bitmaps[0] = new wxBitmap( folder_xpm );
bitmaps[1] = new wxBitmap( folder_xpm );
bitmaps[2] = new wxBitmap( folder_xpm );
bitmaps[3] = new wxBitmap( folder_xpm );
bitmaps[4] = new wxBitmap( folder_xpm );
bitmaps[5] = new wxBitmap( folder_xpm );
bitmaps[6] = new wxBitmap( folder_xpm );
bitmaps[7] = new wxBitmap( folder_xpm );
bitmaps[0] = new wxBitmap( new_xpm );
bitmaps[1] = new wxBitmap( open_xpm );
bitmaps[2] = new wxBitmap( save_xpm );
bitmaps[3] = new wxBitmap( copy_xpm );
bitmaps[4] = new wxBitmap( cut_xpm );
// bitmaps[5] = new wxBitmap( paste_xpm );
bitmaps[5] = new wxBitmap( preview_xpm );
bitmaps[6] = new wxBitmap( print_xpm );
bitmaps[7] = new wxBitmap( help_xpm );
#endif
#ifdef __WXMSW__