From d440dda1e08192ca77b3f046e695e27f23cccd8e Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Fri, 14 Jun 2002 10:21:52 +0000 Subject: [PATCH] minifram sample modified to use XPMs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/minifram/bitmaps/copy.bmp | Bin 238 -> 0 bytes samples/minifram/bitmaps/cut.bmp | Bin 238 -> 0 bytes samples/minifram/bitmaps/help.bmp | Bin 238 -> 0 bytes samples/minifram/bitmaps/new.bmp | Bin 238 -> 0 bytes samples/minifram/bitmaps/open.bmp | Bin 238 -> 0 bytes samples/minifram/bitmaps/page.bmp | Bin 714 -> 0 bytes samples/minifram/bitmaps/paste.bmp | Bin 238 -> 0 bytes samples/minifram/bitmaps/preview.bmp | Bin 238 -> 0 bytes samples/minifram/bitmaps/print.bmp | Bin 238 -> 0 bytes samples/minifram/bitmaps/save.bmp | Bin 238 -> 0 bytes samples/minifram/minifram.cpp | 29 +++++---------------------- samples/minifram/minifram.rc | 9 --------- 12 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 samples/minifram/bitmaps/copy.bmp delete mode 100644 samples/minifram/bitmaps/cut.bmp delete mode 100644 samples/minifram/bitmaps/help.bmp delete mode 100644 samples/minifram/bitmaps/new.bmp delete mode 100644 samples/minifram/bitmaps/open.bmp delete mode 100644 samples/minifram/bitmaps/page.bmp delete mode 100644 samples/minifram/bitmaps/paste.bmp delete mode 100644 samples/minifram/bitmaps/preview.bmp delete mode 100644 samples/minifram/bitmaps/print.bmp delete mode 100644 samples/minifram/bitmaps/save.bmp diff --git a/samples/minifram/bitmaps/copy.bmp b/samples/minifram/bitmaps/copy.bmp deleted file mode 100644 index 4551a06bfa79e0a42c1ffb7cdbb90fd4f699dce2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZvVK?*`K3`9pLxU9$U91{2|@hV+>tjiv)Cz3AyzP{vxy7<$~OeTT!c7JQf6T89- z%?kmn<${;(P#uFN<0A#FuUo(qgT{&F@ekspii W=d@ZzPG(Cb=QBs}_=7thzxV(viB<;y diff --git a/samples/minifram/bitmaps/cut.bmp b/samples/minifram/bitmaps/cut.bmp deleted file mode 100644 index 15554338a01bc4d8f0a501c32237e84200e64583..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZvU!3}^Q5Cqr6gr}Ba8OD(CvKJo2^+{<|WDB@(K8*2TclNjo+kV075Ef~cCTYMZ z2hQ$)mH}PlY>+FWlp?l4?H9GSBqTFi~p=nI%+}YJ={H-mN0|?29BK#fUL#erbtT(lh^R?4vYy(d-6AGn1|j$rr}v KbDqI%Xjd+{i$y;G diff --git a/samples/minifram/bitmaps/new.bmp b/samples/minifram/bitmaps/new.bmp deleted file mode 100644 index d66feb2384ad4c626a078c995c1a3e49af78ec3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmbu2yA6Oa5JQcGL>b0l4tjP;1(ew=nJ8j|<6WY3bU0`GK9aK^RUId`!4(ELX-1{H u>6c`QQqJ8_T9s0iQsQ8(Wab^@`3kuPA_p->w)Xt4Pkz>06 diff --git a/samples/minifram/bitmaps/open.bmp b/samples/minifram/bitmaps/open.bmp deleted file mode 100644 index bbf93fe03364e63f3e18a3507a0e85ab8ea2f87d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmXv{u@M3>3=;=;U&0ua+_3>YyQsonW~6N3OvKTr2(k@|B{{YeKb~(CUb3rr5zpcQ zCn>O}mP9XDa6kd~GO1FGG0<95V`X5i$V8neN$dxz4&8XX3!AZr-;ApY^eS-9oTLj~ Y^Hcc9z2|$wrXTtLH=Rc2n(WoWFRhqJ00000 diff --git a/samples/minifram/bitmaps/page.bmp b/samples/minifram/bitmaps/page.bmp deleted file mode 100644 index 3dbd4b05b4c2d1a4f046141d450caf34c1a3d470..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 714 zcmaJk)fu{chJ-2TT-iZmtVS?uc5roS;-EuD8k*^vaH9hj_d6X ziQgC358^U$kRpEdIqzx8X~Jz0i&xCtBKWwA%eHOw^mwIrw+KG&;&N&1L*Q{1Xmx8p zxBo0O*pac2@{B`!>-fgLdSDP(C2}M>_DcBv60g*0UKyHhy!Oc8UYD-XBeIyOWTry_ zTA4Yuua#Ixm?vFMcI3@F*>XSp02Lyo AJ^%m! diff --git a/samples/minifram/bitmaps/paste.bmp b/samples/minifram/bitmaps/paste.bmp deleted file mode 100644 index 564f514e0df7225f0a7adbe8457b41af537813bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZvVF%Ci@5Jbns$83OZ*I;# co}I%%@f6>ra3+S=gC69}eM%GII+SAI4J;x>B>(^b diff --git a/samples/minifram/bitmaps/preview.bmp b/samples/minifram/bitmaps/preview.bmp deleted file mode 100644 index da1f4dbc4be6c2dd8fb9d7cb71cc48a4a7c139ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZvVu?@p83pv2yNo4mlT?N_pr2ISnd1NHDM5O^cFcMc59&^> z)PfrwsOeYM05)2ipmU4fJIss+o(=cdQCu+!%TlZiKDH!a!aP2;C|UGpLD9M;zmsLJ XIp;lzIUm!ckI6HO{IjaYcZ_-fA4^nl diff --git a/samples/minifram/bitmaps/print.bmp b/samples/minifram/bitmaps/print.bmp deleted file mode 100644 index 00319b55bb23c3c69cc051144d80e5275747c53e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmZur!3_d23^Ni^o@EUFY`~vgA|YX<`*bfpod|VizM>j+f}Fx~Q7! zgtHKM7yg3|DAD^Sp<0YF#C}+nSj(MC$5#Ss27*aN<{l9dYV3`7rsq)3!X>4ws(){6V0MX5FKAjcylGXqN-n#XsS=YhW0WogZT{L^_i_GT%*k@+ph E1NJ~MtpET3 diff --git a/samples/minifram/minifram.cpp b/samples/minifram/minifram.cpp index 436778d198..ebb4d138ba 100644 --- a/samples/minifram/minifram.cpp +++ b/samples/minifram/minifram.cpp @@ -23,8 +23,9 @@ #include "wx/toolbar.h" #include "minifram.h" -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#if !defined(__WXMSW__) #include "mondrian.xpm" +#endif #include "bitmaps/new.xpm" #include "bitmaps/open.xpm" #include "bitmaps/save.xpm" @@ -34,7 +35,7 @@ #include "bitmaps/print.xpm" #include "bitmaps/preview.xpm" #include "bitmaps/help.xpm" -#endif + // start wxWindows @@ -68,13 +69,8 @@ bool MyApp::OnInit() mini_frame->CreateToolBar(wxNO_BORDER|wxTB_HORIZONTAL|wxTB_FLAT, ID_TOOLBAR); InitToolbar(mini_frame->GetToolBar()); -#ifdef __WXMSW__ - main_frame->SetIcon(wxIcon("mondrian")); - mini_frame->SetIcon(wxIcon("mondrian")); -#else - main_frame->SetIcon( wxIcon(mondrian_xpm) ); - mini_frame->SetIcon( wxIcon(mondrian_xpm) ); -#endif + main_frame->SetIcon(wxICON(mondrian)); + mini_frame->SetIcon(wxICON(mondrian)); SetTopWindow(main_frame); @@ -91,16 +87,6 @@ bool MyApp::InitToolbar(wxToolBar* toolBar) // Set up toolbar wxBitmap* toolBarBitmaps[8]; -#ifdef __WXMSW__ - toolBarBitmaps[0] = new wxBitmap("icon1"); - toolBarBitmaps[1] = new wxBitmap("icon2"); - toolBarBitmaps[2] = new wxBitmap("icon3"); - toolBarBitmaps[3] = new wxBitmap("icon4"); - toolBarBitmaps[4] = new wxBitmap("icon5"); - toolBarBitmaps[5] = new wxBitmap("icon6"); - toolBarBitmaps[6] = new wxBitmap("icon7"); - toolBarBitmaps[7] = new wxBitmap("icon8"); -#else toolBarBitmaps[0] = new wxBitmap( new_xpm ); toolBarBitmaps[1] = new wxBitmap( open_xpm ); toolBarBitmaps[2] = new wxBitmap( save_xpm ); @@ -110,13 +96,8 @@ bool MyApp::InitToolbar(wxToolBar* toolBar) toolBarBitmaps[5] = new wxBitmap( preview_xpm ); toolBarBitmaps[6] = new wxBitmap( print_xpm ); toolBarBitmaps[7] = new wxBitmap( help_xpm ); -#endif -#ifdef __WXMSW__ - int width = 24; -#else int width = 16; -#endif int currentX = 5; toolBar->AddTool(wxID_NEW, *(toolBarBitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "New file"); diff --git a/samples/minifram/minifram.rc b/samples/minifram/minifram.rc index 6c9086d0c6..55808f0e34 100644 --- a/samples/minifram/minifram.rc +++ b/samples/minifram/minifram.rc @@ -1,13 +1,4 @@ mondrian ICON "mondrian.ico" #include "wx/msw/wx.rc" -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" -- 2.47.2