DialogEd's missing icons.

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

diff --git a/utils/dialoged/src/bitmaps/alignb.xpm b/utils/dialoged/src/bitmaps/alignb.xpm
new file mode 100644 (file)
index 0000000..c3b57a5
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/alignb.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char *alignb_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+"        ........",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+" .....  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .....  ........",
+"                ",
+"                "
+};

diff --git a/utils/dialoged/src/bitmaps/alignl.xpm b/utils/dialoged/src/bitmaps/alignl.xpm
new file mode 100644 (file)
index 0000000..6d7def9
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/alignl.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char *alignl_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+"   ......       ",
+"   .XXXX.       ",
+"   .XXXX.       ",
+"   .XXXX.       ",
+"   ......       ",
+"                ",
+"                ",
+"   ...........  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   ...........  ",
+"                "
+};

diff --git a/utils/dialoged/src/bitmaps/alignr.xpm b/utils/dialoged/src/bitmaps/alignr.xpm
new file mode 100644 (file)
index 0000000..3f873ee
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/alignr.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char *alignr_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+"        ......  ",
+"        .XXXX.  ",
+"        .XXXX.  ",
+"        .XXXX.  ",
+"        ......  ",
+"                ",
+"                ",
+"   ...........  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   ...........  ",
+"                "
+};

diff --git a/utils/dialoged/src/bitmaps/alignt.xpm b/utils/dialoged/src/bitmaps/alignt.xpm
new file mode 100644 (file)
index 0000000..65fc1b5
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/alignt.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char *alignt_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+" .....  ........",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .....  .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        ........",
+"                ",
+"                "
+};

diff --git a/utils/dialoged/src/bitmaps/copysize.xpm b/utils/dialoged/src/bitmaps/copysize.xpm
new file mode 100644 (file)
index 0000000..4694bd4
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/copysize.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char *copysize_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+".......... ...  ",
+".XXXXXXXX.   .  ",
+".XXXXXXXX.   .  ",
+".XXXXXXXX. .....",
+".XXXXXXXX.  ... ",
+"..........   .  ",
+"                ",
+"    . . . . . . ",
+"                ",
+"    .  ...... . ",
+"       .XXXX.   ",
+"    .  ...... . ",
+"                ",
+"    . . . . . . "
+};

diff --git a/utils/dialoged/src/bitmaps/help.xpm b/utils/dialoged/src/bitmaps/help.xpm
new file mode 100644 (file)
index 0000000..27a87eb
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/help.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char *help_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c #008080",
+/* pixels */
+"                ",
+"     ......     ",
+"    .XXXXX..    ",
+"   .XX...XX..   ",
+"   .X..  .X..   ",
+"   .X.. .XX..   ",
+"    .. .XX..    ",
+"      .XX..     ",
+"      .X..      ",
+"      .X..      ",
+"      .X..      ",
+"       ..       ",
+"      .XX..     ",
+"      .XX..     ",
+"       ...      "
+};

diff --git a/utils/dialoged/src/bitmaps/horiz.xpm b/utils/dialoged/src/bitmaps/horiz.xpm
new file mode 100644 (file)
index 0000000..381e66f
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/horiz.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char *horiz_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+"      .....     ",
+"      .XXX.     ",
+"      .XXX.     ",
+"      .XXX.     ",
+"      .....     ",
+"                ",
+"                ",
+"   ...........  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   ...........  ",
+"                "
+};

diff --git a/utils/dialoged/src/bitmaps/load.xpm b/utils/dialoged/src/bitmaps/load.xpm
index ac643a2e105cfbce7552963ae6fa44e891ee4a75..c15a298f62e262ff9dc748c33f959f8aa6037da7 100644 (file)
--- a/utils/dialoged/src/bitmaps/load.xpm
+++ b/utils/dialoged/src/bitmaps/load.xpm
@@ -2,7 +2,7 @@
 static char *load_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 5 1",
 static char *load_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 5 1",

-"  c #c0c0c0",
+"  c None",

 ". c Black",
 "X c Yellow",
 "o c Gray100",
 ". c Black",
 "X c Yellow",
 "o c Gray100",

diff --git a/utils/dialoged/src/bitmaps/toback.xpm b/utils/dialoged/src/bitmaps/toback.xpm
new file mode 100644 (file)
index 0000000..f7a1c46
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/toback.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char *toback_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 4 1",
+"  c None",
+". c Black",
+"X c #808080",
+"o c Yellow",
+/* pixels */
+" .......        ",
+" .XXXXX.        ",
+" .XXXXX......   ",
+" .XXXXX.oooo.   ",
+" .XXXXX.oooo.   ",
+" .XXXXX.oooo.   ",
+" .......oooo.   ",
+"    .oooo.......",
+"    .oooo.XXXXX.",
+"    .oooo.XXXXX.",
+"    ......XXXXX.",
+"         .XXXXX.",
+"         .XXXXX.",
+"         .......",
+"                "
+};

diff --git a/utils/dialoged/src/bitmaps/tofront.xpm b/utils/dialoged/src/bitmaps/tofront.xpm
new file mode 100644 (file)
index 0000000..f5ce765
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/tofront.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char *tofront_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 4 1",
+"  c None",
+". c Black",
+"X c #808080",
+"o c Yellow",
+/* pixels */
+" .......        ",
+" .XXXXX.        ",
+" .XX.........   ",
+" .XX.ooooooo.   ",
+" .XX.ooooooo.   ",
+" .XX.ooooooo.   ",
+" ....ooooooo.   ",
+"    .ooooooo....",
+"    .ooooooo.XX.",
+"    .ooooooo.XX.",
+"    .........XX.",
+"         .XXXXX.",
+"         .XXXXX.",
+"         .......",
+"                "
+};

diff --git a/utils/dialoged/src/bitmaps/vert.xpm b/utils/dialoged/src/bitmaps/vert.xpm
new file mode 100644 (file)
index 0000000..0f85e23
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/vert.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char *vert_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Yellow",
+/* pixels */
+"                ",
+"        ........",
+"        .XXXXXX.",
+"        .XXXXXX.",
+" .....  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .XXX.  .XXXXXX.",
+" .....  .XXXXXX.",
+"        .XXXXXX.",
+"        .XXXXXX.",
+"        ........",
+"                ",
+"                "
+};

diff --git a/utils/dialoged/src/bitmaps/wxwin.xpm b/utils/dialoged/src/bitmaps/wxwin.xpm
new file mode 100644 (file)
index 0000000..f3f11c2
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/wxwin.xpm
@@ -0,0 +1,46 @@
+/* XPM */
+static char *wxwin_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 8 1",
+"  c Gray100",
+". c Black",
+"X c Green",
+"o c Blue",
+"O c Red",
+"+ c #c0c0c0",
+"@ c Yellow",
+"# c Cyan",
+/* pixels */
+"               ..XXXXXXXXXXXXXXX",
+"o      .....   ..X...XXXXXXXXX..",
+"o o   ..O.X..  ..X.++.XXXXXXX.+.",
+"  o o .OO.XX.  ..XX.++.XXXXX.+.X",
+"O   o .OO.XX.  ..XXX.++.XXX.+.XX",
+"O O   .......  ..XXXX.++.X.+.XXX",
+"  O O ..o.@..  ..XXXXX.++.+.XXXX",
+"o   O ..o.@@.  ..XXXXXX.++.XXXXX",
+"o o   .oo.@@.  ..XXXXX.+.++.XXXX",
+"  o o .o..@@.  ..XXXX.+.X.++.XXX",
+".   o .o.....  ..XXX.+.XXX.++.XX",
+". .   ...  ..  ..XX.+.XXXXX.++.X",
+"  . . .        ..X.+.XXXXXXX.++.",
+"    .          ..X..XXXXXXXXX...",
+"               ..XXXXXXXXXXXXXXX",
+"................................",
+"................................",
+"###############..@@@@@@@@@@@@@@@",
+"########OO#####..@@@@@@@@@@@@@@@",
+"#######OO######..@@@@@@@@@@.@@@@",
+"#######O#######..@@@@@@@@@@..@@@",
+"###OOO##OOO####..@@@..@@@@@@..@@",
+"##OOOOOOOOOO###..@@@..@@@@@@@.@@",
+"##OOOOOOOO#####..@@@@@@@@@@@@.@@",
+"##OOOOOOOO#####..@@@@@@...@@@.@@",
+"##OOOOOOOO#####..@@@@@@@@@@@@.@@",
+"##OOOOOOOOOO###..@@@@@@@@@@@@.@@",
+"##OOOOOOOOOO###..@@@..@@@@@@..@@",
+"###OOOOOOOOO###..@@@..@@@@@..@@@",
+"####OOO#OOO####..@@@@@@@@@@.@@@@",
+"###############..@@@@@@@@@@@@@@@",
+"###############..@@@@@@@@@@@@@@@"
+};

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index ebdfdc6a8aa73d70999b63f893f7658c80e07a7d..1942703c024e62247ab11934172b0c61e7f444b9 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -70,17 +70,17 @@ wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
 #include "bitmaps/load.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/new.xpm"
 #include "bitmaps/load.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/new.xpm"

-#include "bitmaps/vert.xbm"
-#include "bitmaps/alignt.xbm"
-#include "bitmaps/alignb.xbm"
-#include "bitmaps/horiz.xbm"
-#include "bitmaps/alignl.xbm"
-#include "bitmaps/alignr.xbm"
-#include "bitmaps/copysize.xbm"
-#include "bitmaps/tofront.xbm"
-#include "bitmaps/toback.xbm"
-#include "bitmaps/help.xbm"
-#include "bitmaps/wxwin.xbm"
+#include "bitmaps/vert.xpm"
+#include "bitmaps/alignt.xpm"
+#include "bitmaps/alignb.xpm"
+#include "bitmaps/horiz.xpm"
+#include "bitmaps/alignl.xpm"
+#include "bitmaps/alignr.xpm"
+#include "bitmaps/copysize.xpm"
+#include "bitmaps/tofront.xpm"
+#include "bitmaps/toback.xpm"
+#include "bitmaps/help.xpm"
+#include "bitmaps/wxwin.xpm"

 #endif
 
 /*
 #endif
 
 /*


@@ -174,7 +174,7 @@ bool wxResourceManager::Initialize()
     m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
 #endif
 #ifdef __WXGTK__
     m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
 #endif
 #ifdef __WXGTK__

-    m_bitmapImage = new wxBitmap(wxwin_bits, wxwin_width, wxwin_height);
+    m_bitmapImage = new wxBitmap( wxwin_xpm );

 #endif
   }
 
 #endif
   }
 


@@ -734,16 +734,16 @@ wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)
   wxBitmap ToolbarLoadBitmap( load_xpm );
   wxBitmap ToolbarSaveBitmap( save_xpm);
   wxBitmap ToolbarNewBitmap( new_xpm );
   wxBitmap ToolbarLoadBitmap( load_xpm );
   wxBitmap ToolbarSaveBitmap( save_xpm);
   wxBitmap ToolbarNewBitmap( new_xpm );

-  wxBitmap ToolbarVertBitmap(vert_bits, vert_width, vert_height);
-  wxBitmap ToolbarAlignTBitmap(alignt_bits, alignt_width, alignt_height);
-  wxBitmap ToolbarAlignBBitmap(alignb_bits, alignb_width, alignb_height);
-  wxBitmap ToolbarHorizBitmap(horiz_bits, horiz_width, horiz_height);
-  wxBitmap ToolbarAlignLBitmap(alignl_bits, alignl_width, alignl_height);
-  wxBitmap ToolbarAlignRBitmap(alignr_bits, alignr_width, alignr_height);
-  wxBitmap ToolbarCopySizeBitmap(copysize_bits, copysize_width, copysize_height);
-  wxBitmap ToolbarToBackBitmap(toback_bits, toback_width, toback_height);
-  wxBitmap ToolbarToFrontBitmap(tofront_bits, tofront_width, tofront_height);
-  wxBitmap ToolbarHelpBitmap(help_bits, help_width, help_height);
+  wxBitmap ToolbarVertBitmap( vert_xpm );
+  wxBitmap ToolbarAlignTBitmap( alignt_xpm );
+  wxBitmap ToolbarAlignBBitmap( alignb_xpm );
+  wxBitmap ToolbarHorizBitmap( horiz_xpm );
+  wxBitmap ToolbarAlignLBitmap( alignl_xpm );
+  wxBitmap ToolbarAlignRBitmap( alignr_xpm );
+  wxBitmap ToolbarCopySizeBitmap( copysize_xpm );
+  wxBitmap ToolbarToBackBitmap( toback_xpm );
+  wxBitmap ToolbarToFrontBitmap( tofront_xpm );
+  wxBitmap ToolbarHelpBitmap( help_xpm );

 #endif
 
   // Create the toolbar
 #endif
 
   // Create the toolbar