Got printing, toolbar samples compiling under Windows again

[wxWidgets.git] / samples / mdi / mdi.cpp

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index dfcfa0bb4b5e27aade694a991547ee45350fe5ec..aaa465707d115118ef7672585baa2a2764f17afa 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -24,9 +24,18 @@
 #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/help.xpm"
 #endif
 
+
 #include "mdi.h"
 
 MyFrame *frame = NULL;
@@ -52,9 +61,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 +142,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 +316,14 @@ 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[6] = new wxBitmap( print_xpm );
+  bitmaps[7] = new wxBitmap( help_xpm );
 #endif
 
 #ifdef __WXMSW__
@@ -328,7 +333,7 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
 #endif
   int currentX = 5;
 
-  toolBar->AddTool(0, *bitmaps[0], wxNullBitmap, FALSE, currentX, -1, NULL, "New file");
+  toolBar->AddTool(0, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, NULL, "New file");
   currentX += width + 5;
   toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, NULL, "Open file");
   currentX += width + 5;