Made frame layout stuff use system settings for colors, fonts

Added xpm's to frame layout demo area
makd fl_demo use xpm's under GTK
made fl use xpm transparency

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

diff --git a/utils/framelayout/samples/bitmaps/bookmarks.xpm b/utils/framelayout/samples/bitmaps/bookmarks.xpm
new file mode 100644 (file)
index 0000000..baab4a1
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/bookmarks.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * bookmarks_xpm[] = {
+"25 21 6 1",
+"      c None",
+"+     c #000000",
+"@     c #848284",
+"#     c #FFFF00",
+"$     c #0000FF",
+"%     c #000084",
+"                         ",
+"                         ",
+"                         ",
+"   +++++                 ",
+"                         ",
+"   ++++        +         ",
+"              +          ",
+"   ++++++    ++          ",
+"     @####  +$$+         ",
+"   ++##@@##+$$$+         ",
+"    @##@@##%$$%+         ",
+"   ++++@##+%$%%%++       ",
+"      @##  +%%%%$$+      ",
+"      @##  +%%%$$$+      ",
+"      +@@  +%%$$$+       ",
+"     +@##   ++$$+        ",
+"    + @##    @++         ",
+"   +  @@@                ",
+"                         ",
+"                         ",
+"                         "};

diff --git a/utils/framelayout/samples/bitmaps/class_icon.xpm b/utils/framelayout/samples/bitmaps/class_icon.xpm
new file mode 100644 (file)
index 0000000..44baaa0
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/class_icon.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * class_icon_xpm[] = {
+"12 12 15 1",
+"      c None",
+".     c #000000",
+"+     c #800000",
+"@     c #008000",
+"#     c #808000",
+"$     c #000080",
+"%     c #800080",
+"&     c #008080",
+"*     c #808080",
+"-     c #FF0000",
+";     c #00FF00",
+">     c #FFFF00",
+",     c #0000FF",
+"'     c #FF00FF",
+")     c #00FFFF",
+"            ",
+".....       ",
+".,,,.       ",
+".,,,.   ....",
+".,,,.***.''.",
+".,,,. * ....",
+"..... *     ",
+"      *     ",
+"      * ....",
+"      **.)).",
+"        ....",
+"            "};

diff --git a/utils/framelayout/samples/bitmaps/class_icon1.xpm b/utils/framelayout/samples/bitmaps/class_icon1.xpm
new file mode 100644 (file)
index 0000000..a0c55be
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/class_icon1.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * class_icon1_xpm[] = {
+"16 16 6 1",
+"      c None",
+".     c #000000",
+"@     c #0000FF",
+"#     c #FF00FF",
+"$     c #848284",
+"%     c #00FFFF",
+".......         ",
+".@@@@@.    .... ",
+".@@@@@.    .##. ",
+".@@@@@.$$$$.##. ",
+".@@@@@. $  .... ",
+".@@@@@. $       ",
+"....... $       ",
+"        $       ",
+"        $  .... ",
+"        $  .%%. ",
+"        $$$.%%. ",
+"           .... ",
+"                ",
+"                ",
+"                ",
+"                "};

diff --git a/utils/framelayout/samples/bitmaps/copy.xpm b/utils/framelayout/samples/bitmaps/copy.xpm
new file mode 100644 (file)
index 0000000..bbc748b
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/copy.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * copy_xpm[] = {
+"23 21 4 1",
+"      c None",
+"+     c #000000",
+"@     c #FFFFFF",
+"#     c #000084",
+"                       ",
+"                       ",
+"                       ",
+"                       ",
+"  ++++++               ",
+"  +@@@@++              ",
+"  +@@@@+@+             ",
+"  +@++@+######         ",
+"  +@@@@@#@@@@##        ",
+"  +@++++#@@@@#@#       ",
+"  +@@@@@#@++@####      ",
+"  +@++++#@@@@@@@#      ",
+"  +@@@@@#@+++++@#      ",
+"  ++++++#@@@@@@@#      ",
+"        #@+++++@#      ",
+"        #@@@@@@@#      ",
+"        #########      ",
+"                       ",
+"                       ",
+"                       ",
+"                       "};

diff --git a/utils/framelayout/samples/bitmaps/cut.xpm b/utils/framelayout/samples/bitmaps/cut.xpm
new file mode 100644 (file)
index 0000000..9a072d3
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/cut.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * cut_xpm[] = {
+"23 21 3 1",
+"      c None",
+"+     c #000000",
+"@     c #000084",
+"                       ",
+"                       ",
+"                       ",
+"                       ",
+"        +   +          ",
+"        +   +          ",
+"        +   +          ",
+"        ++ ++          ",
+"         + +           ",
+"         +++           ",
+"          +            ",
+"         @+@           ",
+"         @ @@@         ",
+"       @@@ @  @        ",
+"      @  @ @  @        ",
+"      @  @ @  @        ",
+"      @  @  @@         ",
+"       @@              ",
+"                       ",
+"                       ",
+"                       "};

diff --git a/utils/framelayout/samples/bitmaps/file_icon.xpm b/utils/framelayout/samples/bitmaps/file_icon.xpm
new file mode 100644 (file)
index 0000000..a79a01c
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/file_icon.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * file_icon_xpm[] = {
+"12 12 16 1",
+"      c None",
+".     c #000000",
+"+     c #800000",
+"@     c #008000",
+"#     c #808000",
+"$     c #000080",
+"%     c #800080",
+"&     c #008080",
+"*     c #808080",
+"-     c #FF0000",
+";     c #00FF00",
+">     c #FFFF00",
+",     c #0000FF",
+"'     c #FF00FF",
+")     c #00FFFF",
+"!     c #FFFFFF",
+" .......    ",
+" .!!!!!..   ",
+" .!$$$!. .  ",
+" .!!!!!.... ",
+" .!$$$!!!!. ",
+" .!!!!!!!!. ",
+" .!$$$$$$!. ",
+" .!!!!!!!!. ",
+" .!$$$$$$!. ",
+" .!!!!!!!!. ",
+" .!!!!!!!!. ",
+" .......... "};

diff --git a/utils/framelayout/samples/bitmaps/folder_icon.xpm b/utils/framelayout/samples/bitmaps/folder_icon.xpm
new file mode 100644 (file)
index 0000000..015b0ba
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/folder_icon.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * folder_icon_xpm[] = {
+"16 16 6 1",
+"      c None",
+".     c #FFFFFF",
+"+     c #848284",
+"@     c #C6C3C6",
+"#     c #FFFF00",
+"$     c #000000",
+"  +++++         ",
+" +@#@#@+        ",
+"+@#@#@#@++++++  ",
+"+............+$ ",
+"+.#@#@#@#@#@#+$ ",
+"+.@#@#@#@#@#@+$ ",
+"+.#@#@#@#@#@#+$ ",
+"+.@#@#@#@#@#@+$ ",
+"+.#@#@#@#@#@#+$ ",
+"+.@#@#@#@#@#@+$ ",
+"+.#@#@#@#@#@#+$ ",
+"++++++++++++++$ ",
+" $$$$$$$$$$$$$$ ",
+"                ",
+"                ",
+"                "};

diff --git a/utils/framelayout/samples/bitmaps/help_icon.xpm b/utils/framelayout/samples/bitmaps/help_icon.xpm
new file mode 100644 (file)
index 0000000..c01e4e8
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/help_icon.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * help_icon_xpm[] = {
+"12 12 16 1",
+"      c None",
+".     c #000000",
+"+     c #800000",
+"@     c #008000",
+"#     c #808000",
+"$     c #000080",
+"%     c #800080",
+"&     c #008080",
+"*     c #808080",
+"-     c #FF0000",
+";     c #00FF00",
+">     c #FFFF00",
+",     c #0000FF",
+"'     c #FF00FF",
+")     c #00FFFF",
+"!     c #FFFFFF",
+"   .....    ",
+"  .>>>>..   ",
+" .>>..>>..  ",
+" .>.. .>..  ",
+" .>.. .>..  ",
+"  .. .>..   ",
+"    .>..    ",
+"    .>..    ",
+"     ..     ",
+"    .>..    ",
+"    .>..    ",
+"     ..     "};

diff --git a/utils/framelayout/samples/bitmaps/new.xpm b/utils/framelayout/samples/bitmaps/new.xpm
new file mode 100644 (file)
index 0000000..cd988df
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/new.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * new_xpm[] = {
+"21 21 5 1",
+"      c None",
+"+     c #FFFF00",
+"@     c #848284",
+"#     c #000000",
+"$     c #FFFFFF",
+"                     ",
+"                     ",
+"                     ",
+"  +  @+  @###        ",
+"  @+ @$ @+$$##       ",
+"   @+@+@+$$$#$#      ",
+"   +@+$@@@@$#$$#     ",
+"  @@@$++$$$$#####    ",
+"    $@$$@##$$$$$#    ",
+"  @  @+$$$$$$$$$#    ",
+"     @$#######$$#    ",
+"     #$$$$$$$$$$#    ",
+"     #$#######$$#    ",
+"     #$$$$$$$$$$#    ",
+"     #$#######$$#    ",
+"     #$$$$$$$$$$#    ",
+"     #$$$$$$$$$$#    ",
+"     ############    ",
+"                     ",
+"                     ",
+"                     "};

diff --git a/utils/framelayout/samples/bitmaps/nextmark.xpm b/utils/framelayout/samples/bitmaps/nextmark.xpm
new file mode 100644 (file)
index 0000000..a6b9e8d
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/nextmark.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * nextmark_xpm[] = {
+"26 21 6 1",
+"      c None",
+"+     c #848284",
+"@     c #000084",
+"#     c #000000",
+"$     c #FFFF00",
+"%     c #0000FF",
+"                          ",
+"                          ",
+"                          ",
+"      +@@@@               ",
+"     +@   +@  @           ",
+"     @      @@@           ",
+"     @      @@@  #        ",
+"     +@    @@@@ #         ",
+"      +@       ##         ",
+"       +$$$$  #%%#        ",
+"      +$$++$$#%%%#        ",
+"      +$$++$$%%%@#        ",
+"      ++ +$$#%%@@@##      ",
+"        +$$  #@@@@%%#     ",
+"        +$$  #@@@%%%#     ",
+"        #++  #@@%%%#      ",
+"       #+$$   ##%%#       ",
+"      # +$$    +##        ",
+"                          ",
+"                          ",
+"                          "};

diff --git a/utils/framelayout/samples/bitmaps/open.xpm b/utils/framelayout/samples/bitmaps/open.xpm
new file mode 100644 (file)
index 0000000..c0def91
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/open.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * open_xpm[] = {
+"20 21 5 1",
+"      c None",
+"+     c #000000",
+"@     c #FFFFFF",
+"#     c #FFFF00",
+"$     c #848200",
+"                    ",
+"                    ",
+"                    ",
+"           +++      ",
+"          +   + +   ",
+"               ++   ",
+"   +++        +++   ",
+"  +@#@+++++++       ",
+"  +#@#@#@#@#+       ",
+"  +@#@#@#@#@+       ",
+"  +#@#@++++++++++   ",
+"  +@#@+$$$$$$$$$+   ",
+"  +#@+$$$$$$$$$+    ",
+"  +@+$$$$$$$$$+     ",
+"  ++$$$$$$$$$+      ",
+"  +++++++++++       ",
+"                    ",
+"                    ",
+"                    ",
+"                    ",
+"                    "};

diff --git a/utils/framelayout/samples/bitmaps/paste.xpm b/utils/framelayout/samples/bitmaps/paste.xpm
new file mode 100644 (file)
index 0000000..ce3724b
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/paste.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * paste_xpm[] = {
+"23 21 7 1",
+"      c None",
+"+     c #000000",
+"@     c #FFFF00",
+"#     c #848284",
+"$     c #848200",
+"%     c #000084",
+"&     c #FFFFFF",
+"                       ",
+"                       ",
+"                       ",
+"         ++++          ",
+"     +++++@@+++++      ",
+"     +++++@@+++++      ",
+"    +#$#+@++@+$#$+     ",
+"    +$#+      +$#+     ",
+"    +#$++++++++#$+     ",
+"    +$#$#$#$#$#$#+     ",
+"    +#$#$#%%%%%%%+     ",
+"    +$#$#$%&&&&&%%     ",
+"    +#$#$#%&&&&&%&%    ",
+"    +$#$#$%&%%%&%%%    ",
+"    +#$#$#%&&&&&&&%    ",
+"    +$#$#$%&%%%%%&%    ",
+"     +++++%&&&&&&&%    ",
+"          %%%%%%%%%    ",
+"                       ",
+"                       ",
+"                       "};

diff --git a/utils/framelayout/samples/bitmaps/prevmark.xpm b/utils/framelayout/samples/bitmaps/prevmark.xpm
new file mode 100644 (file)
index 0000000..1da7403
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/prevmark.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * prevmark_xpm[] = {
+"26 21 6 1",
+"      c None",
+"+     c #000084",
+"@     c #848284",
+"#     c #000000",
+"$     c #FFFF00",
+"%     c #0000FF",
+"                          ",
+"                          ",
+"        ++++@             ",
+"    +  +@   +@            ",
+"    +++      +            ",
+"    +++      +  #         ",
+"    ++++    +@ #          ",
+"           +@ ##          ",
+"      @$$$$  #%%#         ",
+"     @$$@@$$#%%%#         ",
+"     @$$@@$$%%%+#         ",
+"     @@ @$$#%%+++##       ",
+"       @$$  #++++%%#      ",
+"       @$$  #+++%%%#      ",
+"       #@@  #++%%%#       ",
+"      #@$$   ##%%#        ",
+"     # @$$    @##         ",
+"                          ",
+"                          ",
+"                          ",
+"                          "};

diff --git a/utils/framelayout/samples/bitmaps/res_icon.xpm b/utils/framelayout/samples/bitmaps/res_icon.xpm
new file mode 100644 (file)
index 0000000..e6cd63c
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/res_icon.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+static char * res_icon_xpm[] = {
+"12 12 17 1",
+"      c None",
+".     c #000000",
+"+     c #800000",
+"@     c #008000",
+"#     c #808000",
+"$     c #000080",
+"%     c #800080",
+"&     c #008080",
+"*     c #808080",
+"=     c #C0C0C0",
+"-     c #FF0000",
+";     c #00FF00",
+">     c #FFFF00",
+",     c #0000FF",
+"'     c #FF00FF",
+")     c #00FFFF",
+"!     c #FFFFFF",
+"=..........=",
+".*********=.",
+".*)!.!)!.!!.",
+".*!.;.!.>.!.",
+".*.@;..!.!!.",
+".*.@;@.)!)!.",
+".*!.@.)!)!!.",
+".*..@.....!.",
+".*#.@.*#*#!.",
+".**..*#..*!.",
+".=!!!!!!!!!.",
+"=..........="};

diff --git a/utils/framelayout/samples/bitmaps/save.xpm b/utils/framelayout/samples/bitmaps/save.xpm
new file mode 100644 (file)
index 0000000..c31a287
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/save.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * save_xpm[] = {
+"22 21 4 1",
+"      c None",
+".     c #C6C3C6",
+"+     c #000000",
+"@     c #848200",
+"                      ",
+"                      ",
+"                      ",
+"   ++++++++++++++     ",
+"   +@+........+.+     ",
+"   +@+........+++     ",
+"   +@+........+@+     ",
+"   +@+........+@+     ",
+"   +@+........+@+     ",
+"   +@+........+@+     ",
+"   +@@++++++++@@+     ",
+"   +@@@@@@@@@@@@+     ",
+"   +@@+++++++++@+     ",
+"   +@@++++++..+@+     ",
+"   +@@++++++..+@+     ",
+"   +@@++++++..+@+     ",
+"    +++++++++++++     ",
+"                      ",
+"                      ",
+"                      ",
+"                      "};

diff --git a/utils/framelayout/samples/bitmaps/saveall.xpm b/utils/framelayout/samples/bitmaps/saveall.xpm
new file mode 100644 (file)
index 0000000..a11773e
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/saveall.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * saveall_xpm[] = {
+"23 21 4 1",
+"      c None",
+"+     c #000000",
+"@     c #848200",
+"#     c #FFFFFF",
+"                       ",
+"                       ",
+"       +++++++++++     ",
+"       +@+#####+#+     ",
+"     +++++++++++++     ",
+"     +@+#####+#+@+     ",
+"   +++++++++++++@+     ",
+"   +@+#####+#+@+@+     ",
+"   +@+#####+++@+@+     ",
+"   +@+#####+@+@+@+     ",
+"   +@+#####+@+@+@+     ",
+"   +@@+++++@@+@+@+     ",
+"   +@@@@@@@@@+@+++     ",
+"   +@@++++++@+@+       ",
+"   +@@++++#+@+++       ",
+"   +@@++++#+@+         ",
+"    ++++++++++         ",
+"                       ",
+"                       ",
+"                       ",
+"                       "};

diff --git a/utils/framelayout/samples/bitmaps/search.xpm b/utils/framelayout/samples/bitmaps/search.xpm
new file mode 100644 (file)
index 0000000..8491c5c
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/search.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * search_xpm[] = {
+"22 21 6 1",
+"      c None",
+".     c #C6C3C6",
+"+     c #000000",
+"@     c #FFFF00",
+"#     c #848284",
+"$     c #000084",
+"                      ",
+"                      ",
+"                      ",
+"  +++                 ",
+" +.@#++++++#          ",
+" +@.@.@.@.@+          ",
+" +.@$@.@.@.+          ",
+" +@.@$@.++@+ ++       ",
+" +.@.@$@++.+ ++       ",
+" +@+@.@.@+@+ ++       ",
+" +.@+@+++++#+++++     ",
+" #+++++++++++++++     ",
+"      + ++++ ++++     ",
+"      + ++++ ++++     ",
+"      +++++++++++     ",
+"      +++#   #+++     ",
+"      + +     + +     ",
+"      +++     +++     ",
+"                      ",
+"                      ",
+"                      "};

diff --git a/utils/framelayout/samples/bitmaps/start95_dp.xpm b/utils/framelayout/samples/bitmaps/start95_dp.xpm
new file mode 100644 (file)
index 0000000..ef8725e
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/start95_dp.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * start95_dp_xpm[] = {
+"55 23 8 1",
+"      c None",
+".     c #FFFFFF",
+"+     c #000000",
+"#     c #848284",
+"$     c #FF0000",
+"%     c #00FF00",
+"&     c #0000FF",
+"*     c #FFFF00",
+".....................................................+ ",
+".                                                   #+ ",
+".                                                   #+ ",
+".                                                   #+ ",
+".            ++++                                   #+ ",
+".          ++++++++                                 #+ ",
+".   +     +++$++%+++    ++++                        #+ ",
+".   + + ++++$$++%%++   ++  ++  ++             ++    #+ ",
+".     ++++++$$++%%++   ++      ++             ++    #+ ",
+".   $     ++$++++%++   ++      +++  ++++  +++ +++   #+ ",
+".   $ $ $$++++++++++    ++++   ++      ++ ++  ++    #+ ",
+".     $$$$+++&++*+++       ++  ++   +++++ ++  ++    #+ ",
+".   &     ++&&++**++       ++  ++  ++  ++ ++  ++    #+ ",
+".   & & &&++&&++**++   ++  ++  ++  ++  ++ ++  ++    #+ ",
+".     &&&&++&++++*++    ++++    ++  +++++ ++   ++   #+ ",
+".   +     ++++++++++                                #+ ",
+".   + + +++++    +++                                #+ ",
+".     +++++        +                                #+ ",
+".                                                   #+ ",
+".                                                   #+ ",
+".####################################################+ ",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++ ",
+"                                                       "};

diff --git a/utils/framelayout/samples/bitmaps/start95_pr.xpm b/utils/framelayout/samples/bitmaps/start95_pr.xpm
new file mode 100644 (file)
index 0000000..914384b
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/start95_pr.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * start95_pr_xpm[] = {
+"56 24 9 1",
+"      c None",
+".     c #C6C3C6",
+"+     c #000000",
+"@     c #FFFFFF",
+"#     c #848284",
+"$     c #FF0000",
+"%     c #00FF00",
+"&     c #0000FF",
+"*     c #FFFF00",
+" +++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+" +++++++++++++++++++++++++++++++++++++++++++++++++++++@ ",
+" +################################################### @ ",
+" +#                                                   @ ",
+" +#  + + + + + + + + + + + + + + + + + + + + + + + +  @ ",
+" +# +                                                 @ ",
+" +#            ++++                                +  @ ",
+" +# +        ++++++++                                 @ ",
+" +#   +     +++$++%+++    ++++                     +  @ ",
+" +# + + + ++++$$++%%++   ++  ++  ++             ++    @ ",
+" +#     ++++++$$++%%++   ++      ++             ++ +  @ ",
+" +# + $     ++$++++%++   ++      +++  ++++  +++ +++   @ ",
+" +#   $ $ $$++++++++++    ++++   ++      ++ ++  ++ +  @ ",
+" +# +   $$$$+++&++*+++       ++  ++   +++++ ++  ++    @ ",
+" +#   &     ++&&++**++       ++  ++  ++  ++ ++  ++ +  @ ",
+" +# + & & &&++&&++**++   ++  ++  ++  ++  ++ ++  ++    @ ",
+" +#     &&&&++&++++*++    ++++    ++  +++++ ++   +++  @ ",
+" +# + +     ++++++++++                                @ ",
+" +#   + + +++++    +++                             +  @ ",
+" +# + +  + +  + + + +++ + + + + + + + + + + + + + +   @ ",
+" +#                                                   @ ",
+" +                                                    @ ",
+" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ",
+"                                                        "};

diff --git a/utils/framelayout/samples/bitmaps/tile.xpm b/utils/framelayout/samples/bitmaps/tile.xpm
new file mode 100644 (file)
index 0000000..f425c2f
--- /dev/null
+++ b/utils/framelayout/samples/bitmaps/tile.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+static char * tile_xpm[] = {
+"26 23 6 1",
+"      c None",
+".     c #FFFFFF",
+"+     c #000000",
+"@     c #C6C3C6",
+"#     c #848284",
+"$     c #000084",
+"......................+...",
+".                    #+.  ",
+".                    #+.  ",
+".   $$$$$$$$$$       #+.  ",
+".   $.$$$$$$$$       #+.  ",
+".   $$$$$$$$$$       #+.  ",
+".   $........$       #+.  ",
+".   $.$$$$$$$$$$     #+.  ",
+".   $.$.$$$$$$$$     #+.  ",
+".   $$$$$$$$$$$$     #+.  ",
+".     $........$     #+.  ",
+".     $..$$$$$$$$$$  #+.  ",
+".     $..$.$$$$$$$$  #+.  ",
+".     $$$$$$$$$$$$$  #+.  ",
+".        $........$  #+.  ",
+".        $........$  #+.  ",
+".        $........$  #+.  ",
+".        $$$$$$$$$$  #+.  ",
+".                    #+.  ",
+".                    #+.  ",
+".#####################+.##",
+"++++++++++++++++++++++++++",
+"                          "};

diff --git a/utils/framelayout/samples/demo/Makefile.in b/utils/framelayout/samples/demo/Makefile.in
index e38cb476a25324696f1f81b13fb6bd9b55d66e10..052f24b23e9bdfef4c2d9a055e3429b3f73bfb4a 100644 (file)
--- a/utils/framelayout/samples/demo/Makefile.in
+++ b/utils/framelayout/samples/demo/Makefile.in
@@ -21,7 +21,7 @@ BIN_OBJ=\
 BIN_LINK=-lwx_fl_gtk
 
 # additional things needed to compile
-ADD_COMPILE=-I../../../src
+ADD_COMPILE=-I../../../src -I../../bitmaps
 
 # include the definitions now
 include ../../../../../template.mak

diff --git a/utils/framelayout/samples/demo/fl_demo.cpp b/utils/framelayout/samples/demo/fl_demo.cpp
index 27483bee96411fc6d3e3763b0c421288aace7632..424913c47f2ceb169464bf9981dd33f78e8fdb7f 100644 (file)
--- a/utils/framelayout/samples/demo/fl_demo.cpp
+++ b/utils/framelayout/samples/demo/fl_demo.cpp
@@ -50,6 +50,27 @@
 
 #include "wxinfo.h"
 
+#ifdef __WXGTK__
+#include "start95_dp.xpm"
+#include "start95_pr.xpm"
+#include "bookmarks.xpm"
+#include "class_icon.xpm"
+#include "class_icon1.xpm"
+#include "copy.xpm"
+#include "cut.xpm"
+#include "file_icon.xpm"
+#include "folder_icon.xpm"
+#include "help_icon.xpm"
+#include "new.xpm"
+#include "nextmark.xpm"
+#include "open.xpm"
+#include "paste.xpm"
+#include "prevmark.xpm"
+#include "res_icon.xpm"
+#include "save.xpm"
+#include "saveall.xpm"
+#include "search.xpm"
+#endif
 // ADDED by alex (linker complaints...):
 #ifndef wxDUMMY_OBJ_INCLUDED
 char wxDummyChar=0;
@@ -197,9 +218,9 @@ void StartButton95::OnPaint( wxPaintEvent& event )
     
             mPBmp.LoadFile( "start95_pr_icon", wxBITMAP_TYPE_BMP_RESOURCE );
 #else
-        if ( !mPBmp.Ok() && wxFileExists( "start95_pr.bmp" ) )
+        if ( !mPBmp.Ok() )
     
-            mPBmp.LoadFile( "start95_pr.bmp", wxBITMAP_TYPE_BMP );
+            mPBmp = wxBitmap( start95_pr_xpm);
 #endif
 
         pBmp = &mPBmp;
@@ -212,9 +233,9 @@ void StartButton95::OnPaint( wxPaintEvent& event )
             mDBmp.LoadFile( "start95_dp_icon", wxBITMAP_TYPE_BMP_RESOURCE );
 
 #endif
-        if ( !mDBmp.Ok() && wxFileExists( "start95_dp.bmp" ) )
+        if ( !mDBmp.Ok() )
                                    
-            mDBmp.LoadFile( "start95_dp.bmp", wxBITMAP_TYPE_BMP );
+            mDBmp = wxBitmap(start95_dp_xpm);
 
         pBmp = &mDBmp;
     }
@@ -294,11 +315,8 @@ MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
     bmp1.LoadFile( "folder_icon", wxBITMAP_TYPE_BMP_RESOURCE );
     bmp2.LoadFile( "class_icon1", wxBITMAP_TYPE_BMP_RESOURCE );
 #else
-    if ( wxFileExists( "folder_icon.bmp" ) )
-        bmp1.LoadFile( "folder_icon.bmp", wxBITMAP_TYPE_BMP );
-
-    if ( wxFileExists( "class_icon1.bmp" ) )
-        bmp2.LoadFile( "class_icon1.bmp", wxBITMAP_TYPE_BMP );
+    bmp1 = wxBitmap( folder_icon_xpm);
+    bmp2 = wxBitmap( class_icon1_xpm );
 #endif
     int idx1 = mImageList.Add( bmp1 );
     int idx2 = mImageList.Add( bmp2 );
@@ -796,30 +814,30 @@ void MyFrame::AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent )
     pTBar4->EnableTool( 4, FALSE );
 
 #else
-    pTBar2->AddTool( 2, "search.bmp" );
+    pTBar2->AddTool( 2, search_xpm );
     //pTBar2->AddSeparator();
-    pTBar2->AddTool( 3, "bookmarks.bmp" );
-    pTBar2->AddTool( 4, "nextmark.bmp" );
-    pTBar2->AddTool( 5, "prevmark.bmp" );
+    pTBar2->AddTool( 3, bookmarks_xpm );
+    pTBar2->AddTool( 4, nextmark_xpm );
+    pTBar2->AddTool( 5, prevmark_xpm );
 
 
     wxDynamicToolBar* pTBar3 = new wxDynamicToolBar( mpInternalFrm, -1 );
 
-    pTBar3->AddTool( 1, "open.bmp", wxBITMAP_TYPE_BMP, " Open " );
-    pTBar3->AddTool( 2, "save.bmp", wxBITMAP_TYPE_BMP, " Save " );
-    pTBar3->AddTool( 3, "saveall.bmp", wxBITMAP_TYPE_BMP, " Save All " );
+    pTBar3->AddTool( 1, wxBitmap(open_xpm), " Open " );
+    pTBar3->AddTool( 2, wxBitmap(save_xpm), " Save " );
+    pTBar3->AddTool( 3, wxBitmap(saveall_xpm), " Save All " );
     //pTBar3->AddSeparator();
-    pTBar3->AddTool( 4, "cut.bmp",   wxBITMAP_TYPE_BMP, " Open " );
-    pTBar3->AddTool( 5, "copy.bmp",  wxBITMAP_TYPE_BMP, " Copy " );
-    pTBar3->AddTool( 6, "paste.bmp", wxBITMAP_TYPE_BMP, " Paste " );
+    pTBar3->AddTool( 4, wxBitmap(cut_xpm), " Open " );
+    pTBar3->AddTool( 5, wxBitmap(copy_xpm), " Copy " );
+    pTBar3->AddTool( 6, wxBitmap(paste_xpm), " Paste " );
 
     wxDynamicToolBar* pTBar4 = new wxDynamicToolBar( mpInternalFrm, -1 );
 
-    pTBar4->AddTool( 1, "bookmarks.bmp", wxBITMAP_TYPE_BMP, "Bookmarks ", TRUE );
-    pTBar4->AddTool( 2, "nextmark.bmp",  wxBITMAP_TYPE_BMP, "Next bookmark ", TRUE );
-    pTBar4->AddTool( 3, "prevmark.bmp",  wxBITMAP_TYPE_BMP, "Prev bookmark ", TRUE );
+    pTBar4->AddTool( 1, wxBitmap(bookmarks_xpm), "Bookmarks ", TRUE );
+    pTBar4->AddTool( 2, wxBitmap(nextmark_xpm), "Next bookmark ", TRUE );
+    pTBar4->AddTool( 3, wxBitmap(prevmark_xpm), "Prev bookmark ", TRUE );
     //pTBar4->AddSeparator();
-    pTBar4->AddTool( 4, "search.bmp", wxBITMAP_TYPE_BMP, "Search ", TRUE );
+    pTBar4->AddTool( 4, wxBitmap(search_xpm),"Search ", TRUE );
 #endif
 
     layout.AddBar( pTBar2,              
@@ -857,7 +875,7 @@ wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
         layout.mBorderPen.SetColour( 128,255,128 );
 
         // if so, than make border smaller
-        for( int i = 0; i != MAX_PANES; ++i  )
+        for( int i = 0; i != MAX_PANES; ++i )
         {
             cbDockPane& pane = *layout.GetPane( i );
 
@@ -915,12 +933,12 @@ wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
     pMiniTabArea->AddTab( CreateTxtCtrl( helloworld_src, 
                                          pMiniTabArea), "HelloWorld", &wxBitmap("help_icon") );
 #else
-    pMiniTabArea->AddTab( pClassView,    "ClassView",   "class_icon.bmp", wxBITMAP_TYPE_BMP );
-    pMiniTabArea->AddTab( new wxPanel(), "ResourceView","res_icon.bmp"  );
-    pMiniTabArea->AddTab( new wxPanel(), "FileView",    "file_icon.bmp" );
-    pMiniTabArea->AddTab( new wxPanel(), "InfoView",    "help_icon.bmp" );
+    pMiniTabArea->AddTab( pClassView,    "ClassView",   &wxBitmap(class_icon_xpm));
+    pMiniTabArea->AddTab( new wxPanel(), "ResourceView",&wxBitmap(res_icon_xpm)  );
+    pMiniTabArea->AddTab( new wxPanel(), "FileView",    &wxBitmap(file_icon_xpm) );
+    pMiniTabArea->AddTab( new wxPanel(), "InfoView",    &wxBitmap(help_icon_xpm) );
     pMiniTabArea->AddTab( CreateTxtCtrl( helloworld_src, 
-                                         pMiniTabArea), "HelloWorld", "help_icon.bmp" );
+                                         pMiniTabArea), "HelloWorld", &wxBitmap(help_icon_xpm) );
 #endif
     // now create "output" window
 
@@ -934,7 +952,11 @@ wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
 
     pTabbedArea->AddTab( CreateTxtCtrl("build",   pTabbedArea), "Build",  "" );
     pTabbedArea->AddTab( CreateTxtCtrl("debug",   pTabbedArea), "Debug",  "" );
+#ifdef __WXMSW__
     pTabbedArea->AddTab( pSheet3,                               "Find in Files!", &wxBitmap("file_icon") );
+#else
+    pTabbedArea->AddTab( pSheet3,                               "Find in Files!", &wxBitmap(file_icon_xpm) );
+#endif
     pTabbedArea->AddTab( CreateTxtCtrl("profile", pTabbedArea), "Profile", "" );
 
     layout.AddBar( new StartButton95(pParent), sizes5, wxTOP,    0, 0,  "Start..." );
@@ -1067,13 +1089,13 @@ void MyFrame::DropInSomeBars( int layoutNo )
                pToolBar->AddTool( 1005, wxBitmap("copy_icon") );
                pToolBar->AddTool( 1006, wxBitmap("paste_icon") );
 #else
-               pToolBar->AddTool( 1001, "new.bmp" );
-               pToolBar->AddTool( 1002, "open.bmp" );
-               pToolBar->AddTool( 1003, "save.bmp" );
+               pToolBar->AddTool( 1001, wxBitmap(new_xpm) );
+               pToolBar->AddTool( 1002, wxBitmap(open_xpm) );
+               pToolBar->AddTool( 1003, wxBitmap(save_xpm) );
 
-               pToolBar->AddTool( 1004, "cut.bmp" );
-               pToolBar->AddTool( 1005, "copy.bmp" );
-               pToolBar->AddTool( 1006, "paste.bmp" );
+               pToolBar->AddTool( 1004, wxBitmap(cut_xpm) );
+               pToolBar->AddTool( 1005, wxBitmap(copy_xpm) );
+               pToolBar->AddTool( 1006, wxBitmap(paste_xpm) );
 #endif
                layout.AddBar( pToolBar,  // bar window (can be NULL)
                                           sizes10, wxTOP,         // alignment ( 0-top,1-bottom, etc)