removing bitmaps from mdi sample

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/mdi/bitmaps/bitmap1.bmp b/samples/mdi/bitmaps/bitmap1.bmp
deleted file mode 100644 (file)
index 13e2170..0000000
Binary files a/samples/mdi/bitmaps/bitmap1.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/bitmap2.bmp b/samples/mdi/bitmaps/bitmap2.bmp
deleted file mode 100644 (file)
index 3d523b2..0000000
Binary files a/samples/mdi/bitmaps/bitmap2.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/calc.bmp b/samples/mdi/bitmaps/calc.bmp
deleted file mode 100644 (file)
index 6eee9cc..0000000
Binary files a/samples/mdi/bitmaps/calc.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/copy.bmp b/samples/mdi/bitmaps/copy.bmp
deleted file mode 100644 (file)
index 4551a06..0000000
Binary files a/samples/mdi/bitmaps/copy.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/cut.bmp b/samples/mdi/bitmaps/cut.bmp
deleted file mode 100644 (file)
index 1555433..0000000
Binary files a/samples/mdi/bitmaps/cut.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/dirplain.xbm b/samples/mdi/bitmaps/dirplain.xbm
deleted file mode 100644 (file)
index e2c2f08..0000000
--- a/samples/mdi/bitmaps/dirplain.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define dirplain_width 32
-#define dirplain_height 32
-static char dirplain_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x04,
-   0xfc, 0xff, 0xff, 0x1f, 0x02, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00, 0x60,
-   0x02, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x60,
-   0x02, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x60,
-   0x02, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x60,
-   0x02, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x60,
-   0x02, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x60,
-   0x02, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x60,
-   0xfe, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0xff, 0x7f};

diff --git a/samples/mdi/bitmaps/draft.xbm b/samples/mdi/bitmaps/draft.xbm
deleted file mode 100644 (file)
index 34d8f79..0000000
--- a/samples/mdi/bitmaps/draft.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define draft_width 32
-#define draft_height 32
-static char draft_bits[] = {
-   0x00, 0x80, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x20, 0x02, 0x00,
-   0x00, 0x10, 0x04, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x04, 0x10, 0x00,
-   0x00, 0x02, 0x20, 0x00, 0x00, 0x01, 0x40, 0x00, 0x80, 0x00, 0x80, 0x18,
-   0x40, 0x00, 0x00, 0x3d, 0x20, 0x00, 0x00, 0x76, 0x10, 0x00, 0x00, 0xeb,
-   0xe8, 0xff, 0xff, 0xd5, 0x44, 0x00, 0xc0, 0x6a, 0x82, 0x00, 0x60, 0x35,
-   0x01, 0xf1, 0xb1, 0x5a, 0x02, 0x22, 0xfc, 0x8d, 0x04, 0x44, 0x02, 0x47,
-   0x08, 0x08, 0x01, 0x22, 0x10, 0x90, 0x0c, 0x14, 0x20, 0x80, 0x13, 0x08,
-   0x40, 0x70, 0xfe, 0xf1, 0x80, 0x40, 0x0c, 0xe0, 0x00, 0xb1, 0x00, 0xe0,
-   0x00, 0x5b, 0x01, 0xe0, 0x00, 0xaf, 0x06, 0xe0, 0x00, 0x57, 0xfb, 0xe7,
-   0x00, 0xaf, 0x11, 0xf8, 0x00, 0xde, 0x08, 0xe0, 0x00, 0x7c, 0x04, 0x00,
-   0x00, 0xf8, 0x02, 0x00, 0x00, 0xf0, 0x01, 0x00};

diff --git a/samples/mdi/bitmaps/drawing.xbm b/samples/mdi/bitmaps/drawing.xbm
deleted file mode 100644 (file)
index e5393d4..0000000
--- a/samples/mdi/bitmaps/drawing.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define drawing_width 32
-#define drawing_height 32
-static char drawing_bits[] = {
-   0x00, 0x80, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x20, 0x02, 0x00,
-   0x00, 0x10, 0x04, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x04, 0x10, 0x00,
-   0x00, 0x82, 0x20, 0x00, 0x00, 0xc1, 0x41, 0x00, 0x80, 0xa0, 0x82, 0x00,
-   0x40, 0x90, 0x04, 0x01, 0x20, 0x88, 0x08, 0x02, 0x10, 0x84, 0x10, 0x04,
-   0x08, 0x42, 0x21, 0x08, 0x04, 0x21, 0x22, 0x10, 0x02, 0x11, 0xfc, 0x20,
-   0x11, 0x09, 0x02, 0x41, 0x0a, 0x05, 0x01, 0x82, 0x04, 0x83, 0x0c, 0x44,
-   0x08, 0x81, 0x13, 0x28, 0x10, 0x72, 0xfe, 0xf1, 0x20, 0x44, 0x0c, 0xe0,
-   0x40, 0x88, 0x00, 0xe0, 0x80, 0x10, 0x01, 0xe0, 0x00, 0xa1, 0x06, 0xe0,
-   0x00, 0x42, 0xf8, 0xe7, 0x00, 0x04, 0x40, 0xf8, 0x00, 0x08, 0x20, 0xe0,
-   0x00, 0x10, 0x10, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x40, 0x04, 0x00,
-   0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00};

diff --git a/samples/mdi/bitmaps/flowchar.xbm b/samples/mdi/bitmaps/flowchar.xbm
deleted file mode 100644 (file)
index d75217a..0000000
--- a/samples/mdi/bitmaps/flowchar.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define flowchart_width 32
-#define flowchart_height 32
-static char flowchart_bits[] = {
-   0x00, 0x80, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x20, 0x02, 0x00,
-   0x00, 0x10, 0x04, 0x00, 0x00, 0x88, 0x08, 0x00, 0x00, 0x44, 0x11, 0x00,
-   0x00, 0x22, 0x22, 0x00, 0x00, 0x11, 0x44, 0x00, 0x80, 0x08, 0x82, 0x00,
-   0x40, 0x10, 0x01, 0x01, 0x20, 0xaa, 0x00, 0x02, 0x10, 0x45, 0x00, 0x04,
-   0x88, 0x08, 0x00, 0x08, 0x44, 0x10, 0x00, 0x10, 0x22, 0x08, 0xfc, 0x20,
-   0x41, 0x04, 0x02, 0x41, 0x82, 0x02, 0x01, 0x82, 0x04, 0x81, 0x0c, 0x44,
-   0x08, 0x81, 0x13, 0x28, 0x10, 0x71, 0xfe, 0xf1, 0xa0, 0x4a, 0x0c, 0xe0,
-   0x40, 0x9c, 0x00, 0xe0, 0x80, 0x20, 0x01, 0xe0, 0x00, 0x41, 0x06, 0xe0,
-   0x00, 0x82, 0xf8, 0xe7, 0x00, 0x04, 0x41, 0xf8, 0x00, 0x08, 0x22, 0xe0,
-   0x00, 0x10, 0x14, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x40, 0x04, 0x00,
-   0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00};

diff --git a/samples/mdi/bitmaps/help.bmp b/samples/mdi/bitmaps/help.bmp
deleted file mode 100644 (file)
index 2d9e692..0000000
Binary files a/samples/mdi/bitmaps/help.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/helpcs.bmp b/samples/mdi/bitmaps/helpcs.bmp
deleted file mode 100644 (file)
index 8837381..0000000
Binary files a/samples/mdi/bitmaps/helpcs.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/new.bmp b/samples/mdi/bitmaps/new.bmp
deleted file mode 100644 (file)
index d66feb2..0000000
Binary files a/samples/mdi/bitmaps/new.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/open.bmp b/samples/mdi/bitmaps/open.bmp
deleted file mode 100644 (file)
index bbf93fe..0000000
Binary files a/samples/mdi/bitmaps/open.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/paste.bmp b/samples/mdi/bitmaps/paste.bmp
deleted file mode 100644 (file)
index 564f514..0000000
Binary files a/samples/mdi/bitmaps/paste.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/preview.bmp b/samples/mdi/bitmaps/preview.bmp
deleted file mode 100644 (file)
index da1f4db..0000000
Binary files a/samples/mdi/bitmaps/preview.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/print.bmp b/samples/mdi/bitmaps/print.bmp
deleted file mode 100644 (file)
index 00319b5..0000000
Binary files a/samples/mdi/bitmaps/print.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/save.bmp b/samples/mdi/bitmaps/save.bmp
deleted file mode 100644 (file)
index 56dd10b..0000000
Binary files a/samples/mdi/bitmaps/save.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/tick.bmp b/samples/mdi/bitmaps/tick.bmp
deleted file mode 100644 (file)
index c0d66c9..0000000
Binary files a/samples/mdi/bitmaps/tick.bmp and /dev/null differ

diff --git a/samples/mdi/bitmaps/write.xbm b/samples/mdi/bitmaps/write.xbm
deleted file mode 100644 (file)
index 1409e98..0000000
--- a/samples/mdi/bitmaps/write.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define write_width 32
-#define write_height 32
-static char write_bits[] = {
-   0x00, 0x80, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x20, 0x02, 0x00,
-   0x00, 0x10, 0x04, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x04, 0x10, 0x00,
-   0x00, 0x92, 0x20, 0x00, 0x00, 0x49, 0x40, 0x00, 0x80, 0x04, 0x81, 0x00,
-   0x40, 0x90, 0x04, 0x01, 0x20, 0x09, 0x02, 0x02, 0x90, 0x20, 0x01, 0x04,
-   0x08, 0x92, 0x00, 0x08, 0x24, 0x49, 0x00, 0x10, 0x92, 0x00, 0xfc, 0x20,
-   0x49, 0x12, 0x02, 0x41, 0x22, 0x09, 0x01, 0x82, 0x84, 0x84, 0x0c, 0x44,
-   0x48, 0x82, 0x13, 0x28, 0x10, 0x79, 0xfe, 0xf1, 0x20, 0x44, 0x0c, 0xe0,
-   0x40, 0x82, 0x00, 0xe0, 0x80, 0x00, 0x01, 0xe0, 0x00, 0x01, 0x06, 0xe0,
-   0x00, 0x02, 0xf8, 0xe7, 0x00, 0x04, 0x40, 0xf8, 0x00, 0x08, 0x20, 0xe0,
-   0x00, 0x10, 0x10, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x40, 0x04, 0x00,
-   0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00};

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 5962aca5d814a2bc7150bdd72d2c08fb78b3b2a1..3721a03308577e309989caad85b500fc17eb4ea9 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -33,16 +33,18 @@
 
 #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #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 "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"
+
+
 #include "mdi.h"
 
 IMPLEMENT_APP(MyApp)
@@ -286,16 +288,6 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
 {
     wxBitmap* bitmaps[8];
 
-#ifdef __WXMSW__
-    bitmaps[0] = new wxBitmap("icon1", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[1] = new wxBitmap("icon2", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[2] = new wxBitmap("icon3", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[3] = new wxBitmap("icon4", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[4] = new wxBitmap("icon5", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[5] = new wxBitmap("icon6", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[6] = new wxBitmap("icon7", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[7] = new wxBitmap("icon8", wxBITMAP_TYPE_RESOURCE);
-#else
     bitmaps[0] = new wxBitmap( new_xpm );
     bitmaps[1] = new wxBitmap( open_xpm );
     bitmaps[2] = new wxBitmap( save_xpm );
@@ -304,13 +296,8 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
     bitmaps[5] = new wxBitmap( paste_xpm );
     bitmaps[6] = new wxBitmap( print_xpm );
     bitmaps[7] = new wxBitmap( help_xpm );
-#endif
 
-#ifdef __WXMSW__
     int width = 24;
-#else
-    int width = 16;
-#endif
     int currentX = 5;
 
     toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "New file");

diff --git a/samples/mdi/mdi.rc b/samples/mdi/mdi.rc
index 173542b99b9e3df88f6489705d7de23ecbb7efbd..5f15ef743e01950c9de0677a75cacb0ba7eabf54 100644 (file)
--- a/samples/mdi/mdi.rc
+++ b/samples/mdi/mdi.rc
@@ -10,15 +10,6 @@ wxSTD_MDICHILDFRAME     ICON    "chart.ico"
 mdi_icn                 ICON    "mondrian.ico"
 chrt_icn                ICON    "chart.ico"
 
-icon1 BITMAP "bitmaps/new.bmp"
-icon2 BITMAP "bitmaps/open.bmp"
-icon3 BITMAP "bitmaps/save.bmp"
-icon4 BITMAP "bitmaps/copy.bmp"
-icon5 BITMAP "bitmaps/cut.bmp"
-icon6 BITMAP "bitmaps/paste.bmp"
-icon7 BITMAP "bitmaps/print.bmp"
-
-icon8 BITMAP "bitmaps/help.bmp"
 
 #include "wx/msw/wx.rc"