Linux port now uses GTK stock items for toolbar and menu bar.

This commit is contained in:
Gerald Schmidt 2007-09-30 12:37:48 +00:00
parent d1c008912d
commit 6d92659fc7
1 changed files with 20 additions and 22 deletions

View File

@ -52,6 +52,8 @@
#include <wx/aui/auibook.h> #include <wx/aui/auibook.h>
#include <wx/richtext/richtextsymboldlg.h> #include <wx/richtext/richtextsymboldlg.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/artprov.h>
#include <wx/stockitem.h>
#include <iconv.h> #include <iconv.h>
#define ngettext wxGetTranslation #define ngettext wxGetTranslation
@ -5831,30 +5833,26 @@ void MyFrame::loadBitmaps()
#else #else
// toolbar icons // toolbar icons
newBitmap = wxArtProvider::GetBitmap ( wxART_NEW, wxART_TOOLBAR);
newBitmap.LoadFile ( pngDir + _T ( "stock_new.png" ), wxBITMAP_TYPE_PNG ); openBitmap = wxArtProvider::GetBitmap ( wxART_FILE_OPEN, wxART_TOOLBAR);
openBitmap.LoadFile ( pngDir + _T ( "stock_open.png" ), wxBITMAP_TYPE_PNG ); saveBitmap = wxArtProvider::GetBitmap ( wxART_FILE_SAVE, wxART_TOOLBAR);
saveBitmap.LoadFile ( pngDir + _T ( "stock_save.png" ), wxBITMAP_TYPE_PNG ); printBitmap = wxArtProvider::GetBitmap ( wxART_PRINT, wxART_TOOLBAR);
printBitmap.LoadFile ( pngDir + _T ( "stock_print.png" ), wxBITMAP_TYPE_PNG ); spellingBitmap = wxArtProvider::GetBitmap ( _T("gtk-spell-check"), wxART_TOOLBAR);
spellingBitmap.LoadFile ( pngDir + _T ( "stock_spellcheck.png" ), wxBITMAP_TYPE_PNG );
internetBitmap.LoadFile ( pngDir + _T ( "stock_internet.png" ), wxBITMAP_TYPE_PNG );
hyperlinkBitmap.LoadFile ( pngDir + _T ( "stock_hyperlink.png" ), wxBITMAP_TYPE_PNG );
filtersBitmap.LoadFile ( pngDir + _T ( "stock_filters.png" ), wxBITMAP_TYPE_PNG );
// menu icons // menu icons
new16Bitmap.LoadFile ( pngDir + _T ( "stock_new-16.png" ), wxBITMAP_TYPE_PNG ); new16Bitmap = wxNullBitmap;
open16Bitmap.LoadFile ( pngDir + _T ( "stock_open-16.png" ), wxBITMAP_TYPE_PNG ); open16Bitmap = wxNullBitmap;
save16Bitmap.LoadFile ( pngDir + _T ( "stock_save-16.png" ), wxBITMAP_TYPE_PNG ); save16Bitmap = wxNullBitmap;
printPreviewBitmap.LoadFile ( pngDir + _T ( "stock_print_preview.png" ), wxBITMAP_TYPE_PNG ); printPreviewBitmap = wxNullBitmap;
print16Bitmap.LoadFile ( pngDir + _T ( "stock_print-16.png" ), wxBITMAP_TYPE_PNG ); print16Bitmap = wxNullBitmap;
undo16Bitmap.LoadFile ( pngDir + _T ( "stock_undo-16.png" ), wxBITMAP_TYPE_PNG ); undo16Bitmap = wxNullBitmap;
redo16Bitmap.LoadFile ( pngDir + _T ( "stock_redo-16.png" ), wxBITMAP_TYPE_PNG ); redo16Bitmap = wxNullBitmap;
cutBitmap.LoadFile ( pngDir + _T ( "stock_cut-16.png" ), wxBITMAP_TYPE_PNG ); cutBitmap = wxNullBitmap;
copyBitmap.LoadFile ( pngDir + _T ( "stock_copy-16.png" ), wxBITMAP_TYPE_PNG ); copyBitmap = wxNullBitmap;
pasteBitmap.LoadFile ( pngDir + _T ( "stock_paste-16.png" ), wxBITMAP_TYPE_PNG ); pasteBitmap = wxNullBitmap;
findBitmap.LoadFile ( pngDir + _T ( "stock_find-16.png" ), wxBITMAP_TYPE_PNG ); findBitmap = wxNullBitmap;
spelling16Bitmap.LoadFile ( pngDir + _T ( "stock_spellcheck-16.png" ), wxBITMAP_TYPE_PNG ); spelling16Bitmap = wxNullBitmap;
helpBitmap.LoadFile ( pngDir + _T ( "stock_help-16.png" ), wxBITMAP_TYPE_PNG ); helpBitmap = wxNullBitmap;
#endif #endif
} }