diff --git a/contrib/docs/latex/fl/contents.gif b/contrib/docs/latex/fl/contents.gif index 723174f81d..da92528ddd 100644 Binary files a/contrib/docs/latex/fl/contents.gif and b/contrib/docs/latex/fl/contents.gif differ diff --git a/contrib/docs/latex/gizmos/contents.gif b/contrib/docs/latex/gizmos/contents.gif index 723174f81d..da92528ddd 100644 Binary files a/contrib/docs/latex/gizmos/contents.gif and b/contrib/docs/latex/gizmos/contents.gif differ diff --git a/contrib/docs/latex/mmedia/contents.gif b/contrib/docs/latex/mmedia/contents.gif index 3dddfa3dd5..da92528ddd 100644 Binary files a/contrib/docs/latex/mmedia/contents.gif and b/contrib/docs/latex/mmedia/contents.gif differ diff --git a/contrib/docs/latex/ogl/contents.gif b/contrib/docs/latex/ogl/contents.gif index 723174f81d..da92528ddd 100644 Binary files a/contrib/docs/latex/ogl/contents.gif and b/contrib/docs/latex/ogl/contents.gif differ diff --git a/contrib/docs/latex/svg/contents.gif b/contrib/docs/latex/svg/contents.gif index 723174f81d..da92528ddd 100644 Binary files a/contrib/docs/latex/svg/contents.gif and b/contrib/docs/latex/svg/contents.gif differ diff --git a/contrib/samples/ogl/ogledit/ogledit.rc b/contrib/samples/ogl/ogledit/ogledit.rc index 046f0c6f45..fe1ac37f07 100644 --- a/contrib/samples/ogl/ogledit/ogledit.rc +++ b/contrib/samples/ogl/ogledit/ogledit.rc @@ -1,10 +1,4 @@ ogl ICON ogl.ico -TOOL1 BITMAP "bitmaps/tool1.bmp" -TOOL2 BITMAP "bitmaps/tool2.bmp" -TOOL3 BITMAP "bitmaps/tool3.bmp" -TOOL4 BITMAP "bitmaps/tool4.bmp" -ARROWTOOL BITMAP "bitmaps/arrow.bmp" - #include "wx/msw/wx.rc" diff --git a/contrib/samples/ogl/studio/bitmaps/alignb.bmp b/contrib/samples/ogl/studio/bitmaps/alignb.bmp deleted file mode 100644 index 6cc2e1dee4..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/alignb.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/alignl.bmp b/contrib/samples/ogl/studio/bitmaps/alignl.bmp deleted file mode 100644 index 30471101b1..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/alignl.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/alignr.bmp b/contrib/samples/ogl/studio/bitmaps/alignr.bmp deleted file mode 100644 index 14a2f85241..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/alignr.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/alignt.bmp b/contrib/samples/ogl/studio/bitmaps/alignt.bmp deleted file mode 100644 index 4505cbab56..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/alignt.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/copy.bmp b/contrib/samples/ogl/studio/bitmaps/copy.bmp deleted file mode 100644 index 4551a06bfa..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/copy.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/copysize.bmp b/contrib/samples/ogl/studio/bitmaps/copysize.bmp deleted file mode 100644 index 36060ad72b..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/copysize.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/cut.bmp b/contrib/samples/ogl/studio/bitmaps/cut.bmp deleted file mode 100644 index 15554338a0..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/cut.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/cutpoint.bmp b/contrib/samples/ogl/studio/bitmaps/cutpoint.bmp deleted file mode 100644 index 2f7dc780a2..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/cutpoint.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/help.bmp b/contrib/samples/ogl/studio/bitmaps/help.bmp deleted file mode 100644 index 2d9e6922ca..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/help.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/helpcs.bmp b/contrib/samples/ogl/studio/bitmaps/helpcs.bmp deleted file mode 100644 index 8837381681..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/helpcs.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/horiz.bmp b/contrib/samples/ogl/studio/bitmaps/horiz.bmp deleted file mode 100644 index 58af34a727..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/horiz.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/linearrow.bmp b/contrib/samples/ogl/studio/bitmaps/linearrow.bmp deleted file mode 100644 index 1fd21fb08a..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/linearrow.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/new.bmp b/contrib/samples/ogl/studio/bitmaps/new.bmp deleted file mode 100644 index d66feb2384..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/new.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/newpoint.bmp b/contrib/samples/ogl/studio/bitmaps/newpoint.bmp deleted file mode 100644 index cb4f267afc..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/newpoint.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/open.bmp b/contrib/samples/ogl/studio/bitmaps/open.bmp deleted file mode 100644 index bbf93fe033..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/open.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/paste.bmp b/contrib/samples/ogl/studio/bitmaps/paste.bmp deleted file mode 100644 index 564f514e0d..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/paste.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/preview.bmp b/contrib/samples/ogl/studio/bitmaps/preview.bmp deleted file mode 100644 index da1f4dbc4b..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/preview.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/print.bmp b/contrib/samples/ogl/studio/bitmaps/print.bmp deleted file mode 100644 index 00319b55bb..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/print.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/redo.bmp b/contrib/samples/ogl/studio/bitmaps/redo.bmp deleted file mode 100644 index 5877e34e00..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/redo.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/save.bmp b/contrib/samples/ogl/studio/bitmaps/save.bmp deleted file mode 100644 index 56dd10b6e3..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/save.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/straight.bmp b/contrib/samples/ogl/studio/bitmaps/straight.bmp deleted file mode 100644 index 529366590b..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/straight.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/toback.bmp b/contrib/samples/ogl/studio/bitmaps/toback.bmp deleted file mode 100644 index d2e5efffce..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/toback.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/toback.xpm b/contrib/samples/ogl/studio/bitmaps/toback.xpm deleted file mode 100644 index f7a1c46ab8..0000000000 --- a/contrib/samples/ogl/studio/bitmaps/toback.xpm +++ /dev/null @@ -1,25 +0,0 @@ -/* 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/contrib/samples/ogl/studio/bitmaps/tofront.bmp b/contrib/samples/ogl/studio/bitmaps/tofront.bmp deleted file mode 100644 index 5b17cc44c8..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/tofront.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/tofront.xpm b/contrib/samples/ogl/studio/bitmaps/tofront.xpm deleted file mode 100644 index f5ce7652a2..0000000000 --- a/contrib/samples/ogl/studio/bitmaps/tofront.xpm +++ /dev/null @@ -1,25 +0,0 @@ -/* 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/contrib/samples/ogl/studio/bitmaps/undo.bmp b/contrib/samples/ogl/studio/bitmaps/undo.bmp deleted file mode 100644 index 4ad80c772f..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/undo.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/vert.bmp b/contrib/samples/ogl/studio/bitmaps/vert.bmp deleted file mode 100644 index dfd7b5cb53..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/vert.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/manual/contents.gif b/contrib/samples/ogl/studio/manual/contents.gif index 3dddfa3dd5..da92528ddd 100644 Binary files a/contrib/samples/ogl/studio/manual/contents.gif and b/contrib/samples/ogl/studio/manual/contents.gif differ diff --git a/contrib/samples/ogl/studio/studio.cpp b/contrib/samples/ogl/studio/studio.cpp index 4e45f3c01c..7e62d67e4f 100644 --- a/contrib/samples/ogl/studio/studio.cpp +++ b/contrib/samples/ogl/studio/studio.cpp @@ -35,7 +35,6 @@ #include "project.h" #include "symbols.h" -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "bitmaps/new.xpm" #include "bitmaps/open.xpm" #include "bitmaps/save.xpm" @@ -60,7 +59,6 @@ #include "bitmaps/straight.xpm" #include "studio.xpm" -#endif IMPLEMENT_APP(csApp) @@ -324,18 +322,6 @@ void csApp::InitToolBar(wxToolBar* toolBar) { wxBitmap* bitmaps[10]; -#ifdef __WXMSW__ - bitmaps[0] = new wxBitmap(_T("new"), wxBITMAP_TYPE_RESOURCE); - bitmaps[1] = new wxBitmap(_T("open"), wxBITMAP_TYPE_RESOURCE); - bitmaps[2] = new wxBitmap(_T("save"), wxBITMAP_TYPE_RESOURCE); - bitmaps[3] = new wxBitmap(_T("copy"), wxBITMAP_TYPE_RESOURCE); - bitmaps[4] = new wxBitmap(_T("cut"), wxBITMAP_TYPE_RESOURCE); - bitmaps[5] = new wxBitmap(_T("paste"), wxBITMAP_TYPE_RESOURCE); - bitmaps[6] = new wxBitmap(_T("print"), wxBITMAP_TYPE_RESOURCE); - bitmaps[7] = new wxBitmap(_T("help"), wxBITMAP_TYPE_RESOURCE); - bitmaps[8] = new wxBitmap(_T("undo"), wxBITMAP_TYPE_RESOURCE); - bitmaps[9] = new wxBitmap(_T("redo"), wxBITMAP_TYPE_RESOURCE); -#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) bitmaps[0] = new wxBitmap( new_xpm ); bitmaps[1] = new wxBitmap( open_xpm ); bitmaps[2] = new wxBitmap( save_xpm ); @@ -346,36 +332,33 @@ void csApp::InitToolBar(wxToolBar* toolBar) bitmaps[7] = new wxBitmap( help_xpm ); bitmaps[8] = new wxBitmap( undo_xpm ); bitmaps[9] = new wxBitmap( redo_xpm ); -#else -#error "Not implemented for this platform." -#endif - toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("New file")); - toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Open file")); - toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Save file")); - toolBar->AddSeparator(); - toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Print")); - toolBar->AddSeparator(); - toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Copy")); - toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Cut")); - toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Paste")); - toolBar->AddSeparator(); - toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Undo")); - toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Redo")); - toolBar->AddSeparator(); - toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Help")); + toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("New file")); + toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Open file")); + toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Save file")); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Print")); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Copy")); + toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Cut")); + toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Paste")); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Undo")); + toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Redo")); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Help")); - toolBar->Realize(); + toolBar->Realize(); - toolBar->EnableTool(wxID_COPY, false); - toolBar->EnableTool(wxID_PASTE, false); - toolBar->EnableTool(wxID_PRINT, false); - toolBar->EnableTool(wxID_UNDO, false); - toolBar->EnableTool(wxID_REDO, false); + toolBar->EnableTool(wxID_COPY, false); + toolBar->EnableTool(wxID_PASTE, false); + toolBar->EnableTool(wxID_PRINT, false); + toolBar->EnableTool(wxID_UNDO, false); + toolBar->EnableTool(wxID_REDO, false); - int i; - for (i = 0; i < 10; i++) - delete bitmaps[i]; + int i; + for (i = 0; i < 10; i++) + delete bitmaps[i]; } // Create and initialise the diagram toolbar @@ -396,19 +379,6 @@ void csApp::CreateDiagramToolBar(wxFrame* parent) wxBitmap* bitmaps[11]; -#ifdef __WXMSW__ - bitmaps[0] = new wxBitmap(_T("alignl"), wxBITMAP_TYPE_RESOURCE); - bitmaps[1] = new wxBitmap(_T("alignr"), wxBITMAP_TYPE_RESOURCE); - bitmaps[2] = new wxBitmap(_T("alignt"), wxBITMAP_TYPE_RESOURCE); - bitmaps[3] = new wxBitmap(_T("alignb"), wxBITMAP_TYPE_RESOURCE); - bitmaps[4] = new wxBitmap(_T("horiz"), wxBITMAP_TYPE_RESOURCE); - bitmaps[5] = new wxBitmap(_T("vert"), wxBITMAP_TYPE_RESOURCE); - bitmaps[6] = new wxBitmap(_T("copysize"), wxBITMAP_TYPE_RESOURCE); - bitmaps[7] = new wxBitmap(_T("linearrow"), wxBITMAP_TYPE_RESOURCE); - bitmaps[8] = new wxBitmap(_T("newpoint"), wxBITMAP_TYPE_RESOURCE); - bitmaps[9] = new wxBitmap(_T("cutpoint"), wxBITMAP_TYPE_RESOURCE); - bitmaps[10] = new wxBitmap(_T("straighten"), wxBITMAP_TYPE_RESOURCE); -#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) bitmaps[0] = new wxBitmap( alignl_xpm ); bitmaps[1] = new wxBitmap( alignr_xpm ); bitmaps[2] = new wxBitmap( alignt_xpm ); @@ -420,9 +390,6 @@ void csApp::CreateDiagramToolBar(wxFrame* parent) bitmaps[8] = new wxBitmap( newpoint_xpm ); bitmaps[9] = new wxBitmap( cutpoint_xpm ); bitmaps[10] = new wxBitmap( straight_xpm ); -#else -#error "Not implemented for this platform." -#endif m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNL, *bitmaps[0], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align left")); m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNR, *bitmaps[1], wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL, _T("Align right")); diff --git a/contrib/samples/ogl/studio/studio.rc b/contrib/samples/ogl/studio/studio.rc index 70a7a9c9e4..e63bd2bfab 100644 --- a/contrib/samples/ogl/studio/studio.rc +++ b/contrib/samples/ogl/studio/studio.rc @@ -7,35 +7,12 @@ aaaa ICON "studio.ico" wxSTD_MDIPARENTFRAME ICON "studio.ico" wxSTD_MDICHILDFRAME ICON "studio.ico" -studio ICON "studio.ico" +studio ICON "studio.ico" folder1 ICON "bitmaps/folder1.ico" file1 ICON "bitmaps/file1.ico" -new BITMAP "bitmaps/new.bmp" -open BITMAP "bitmaps/open.bmp" -save BITMAP "bitmaps/save.bmp" -copy BITMAP "bitmaps/copy.bmp" -cut BITMAP "bitmaps/cut.bmp" -paste BITMAP "bitmaps/paste.bmp" -print BITMAP "bitmaps/print.bmp" -help BITMAP "bitmaps/help.bmp" -undo BITMAP "bitmaps/undo.bmp" -redo BITMAP "bitmaps/redo.bmp" - arrowtool BITMAP "bitmaps/arrow.bmp" texttool BITMAP "bitmaps/texttool.bmp" -alignl BITMAP "bitmaps/alignl.bmp" -alignb BITMAP "bitmaps/alignb.bmp" -alignr BITMAP "bitmaps/alignr.bmp" -alignt BITMAP "bitmaps/alignt.bmp" -copysize BITMAP "bitmaps/copysize.bmp" -vert BITMAP "bitmaps/vert.bmp" -horiz BITMAP "bitmaps/horiz.bmp" -linearrow BITMAP "bitmaps/linearrow.bmp" -newpoint BITMAP "bitmaps/newpoint.bmp" -cutpoint BITMAP "bitmaps/cutpoint.bmp" -straighten BITMAP "bitmaps/straight.bmp" - #include "wx/msw/wx.rc" diff --git a/samples/sockets/connect.ico b/samples/sockets/connect.ico index 74f006f82a..7844dfd2bc 100644 Binary files a/samples/sockets/connect.ico and b/samples/sockets/connect.ico differ