#ifdef'd out some parts for non-supported systems.

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

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 5aee6a0806fc055c720fbc42139e5bab1df11831..56f3a75047151d537380974e2946a2ffea105cf0 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;
@@ -51,9 +60,8 @@ bool MyApp::OnInit(void)
   // Give it an icon (this is ignored in MDI mode: uses resources)
 #ifdef __WXMSW__
   frame->SetIcon(wxIcon("mdi_icn"));
-#endif
-#ifdef __X__
-  frame->SetIcon(wxIcon("aiai.xbm"));
+#else
+  frame->SetIcon(wxIcon( mondrian_xpm ));
 #endif
 
   // Make a menubar
@@ -100,6 +108,16 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
 
     CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL);
     InitToolBar(GetToolBar());
+
+#ifdef __WXMSW__
+    // Accelerators
+    wxAcceleratorEntry entries[3];
+    entries[0].Set(wxACCEL_CTRL, (int) 'N', MDI_NEW_WINDOW);
+    entries[1].Set(wxACCEL_CTRL, (int) 'X', MDI_QUIT);
+    entries[2].Set(wxACCEL_CTRL, (int) 'A', MDI_ABOUT);
+    wxAcceleratorTable accel(3, entries);
+    SetAcceleratorTable(accel);
+#endif
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
@@ -127,9 +145,6 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
 #ifdef __WXMSW__
       subframe->SetIcon(wxIcon("chrt_icn"));
 #endif
-#ifdef __X__
-      subframe->SetIcon(wxIcon("aiai.xbm"));
-#endif
 
       // Give it a status line
       subframe->CreateStatusBar();
@@ -301,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__
@@ -318,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;