Skip to content

Commit

Permalink
use SetImages for wxTreeCtrl and wxBitmapBundle
Browse files Browse the repository at this point in the history
  • Loading branch information
@guanlisheng
guanlisheng committed Dec 9, 2024
1 parent bf6e503 commit ac9637f
Show file tree
Hide file tree
Showing 11 changed files with 162 additions and 150 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC src)

if(APPLE)
set_target_properties(${PROJECT_NAME} PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/build/Info.plist.in
RESOURCE "build/wxmac.icns"
MACOSX_BUNDLE_ICON_FILE wxmac.icns
MACOSX_BUNDLE_COPYRIGHT "Copyright wxWidgets"
Expand Down
40 changes: 20 additions & 20 deletions build/Info.plist.in
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
<plist version="0.9">
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleIdentifier</key>
<string>org.wxwindows.IDENTIFIER</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>EXECUTABLE</string>
<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>CFBundleIconFile</key>
<string>wxmac.icns</string>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundleIdentifier</key>
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key>
<string>EXECUTABLE</string>
<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>VERSION</string>
<key>CFBundleShortVersionString</key>
<string>VERSION</string>
<key>CFBundleGetInfoString</key>
<string>EXECUTABLE version VERSION, (c) 2002-2006 wxWidgets</string>
<key>CFBundleLongVersionString</key>
<string>VERSION, (c) 2002-2006 wxWidgets</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2002-2006 wxWidgets</string>
<key>LSRequiresCarbon</key>
<true/>
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>NSHighResolutionCapable</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions src/indexbook.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ void wxIndexBook::CreateControls()
m_PageColumns->SetDefaultRowSize(25);
m_PageColumns->SetColLabelSize(25);

wxBitmap m_PageColumnsBitmap(wxGetApp().GetBmp(ID_BMP_FIELD));
wxBitmapBundle m_PageColumnsBitmap(wxGetApp().GetBmp(ID_BMP_FIELD));
noteBook->AddPage(m_PageColumns, _("Columns"), false, m_PageColumnsBitmap);

m_PageDdl = new wxDDLEditor(noteBook, ID_PAGEDDL);

wxBitmap m_PageDdlBitmap(wxGetApp().GetBmp(ID_BMP_RUNSCRIPT));
wxBitmapBundle m_PageDdlBitmap(wxGetApp().GetBmp(ID_BMP_RUNSCRIPT));
noteBook->AddPage(m_PageDdl, _("DDL"), false, m_PageDdlBitmap);

bSizer->Add(noteBook, 1, wxGROW, 0);
Expand Down
6 changes: 3 additions & 3 deletions src/paneldata.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ void wxPanelData::CreateControls()
wxToolBar* iToolBar1 = new wxToolBar(this, ID_DATATOOLBAR, wxDefaultPosition,
wxDefaultSize,
wxTB_FLAT|wxTB_HORIZONTAL|wxTB_NODIVIDER);
wxBitmap filterBmp(wxGetApp().GetBmp(ID_BMP_FILTER));
wxBitmapBundle filterBmp(wxGetApp().GetBmp(ID_BMP_FILTER));
iToolBar1->AddTool(ID_MNU_FILTER, _("Filter"), filterBmp, BitmapDisabled,
wxITEM_NORMAL, _("Filter"), _("Filter"));
wxBitmap sortBmp(wxGetApp().GetBmp(ID_BMP_SORT));
wxBitmapBundle sortBmp(wxGetApp().GetBmp(ID_BMP_SORT));
iToolBar1->AddTool(ID_MNU_SORT, _("Sort"), sortBmp, BitmapDisabled,
wxITEM_NORMAL, _("Sort"), _("Sort"));
wxBitmap refreshBmp(wxGetApp().GetBmp(ID_BMP_REFRESH));
wxBitmapBundle refreshBmp(wxGetApp().GetBmp(ID_BMP_REFRESH));
iToolBar1->AddTool(ID_MNU_REFRESH, _("Refresh"), refreshBmp, BitmapDisabled,
wxITEM_NORMAL, _("Refresh"), _("Refresh"));
iToolBar1->AddSeparator();
Expand Down
6 changes: 3 additions & 3 deletions src/sqlbook.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,14 @@ void wxSQLBook::CreateControls()
m_DataResult->SetColLabelSize(25);
m_DataResult->SetRowLabelSize(50);

wxBitmap m_DataResultBitmap(wxGetApp().GetBmp(ID_BMP_RUNSQL));
wxBitmapBundle m_DataResultBitmap(wxGetApp().GetBmp(ID_BMP_RUNSQL));
m_ResultBook->AddPage(m_DataResult, _("Results"), false, m_DataResultBitmap);

m_LogResult = new wxTextCtrl(m_ResultBook, ID_LOGRESULT, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE|wxTE_READONLY|wxTE_WORDWRAP);

wxBitmap m_LogResultBitmap(wxGetApp().GetBmp(ID_BMP_LOG));
wxBitmapBundle m_LogResultBitmap(wxGetApp().GetBmp(ID_BMP_LOG));
m_ResultBook->AddPage(m_LogResult, _("Output"), false, m_LogResultBitmap);

m_Explain = new wxSpecGrid(m_ResultBook, ID_GRIDEXPLAIN, wxDefaultPosition,
Expand All @@ -222,7 +222,7 @@ void wxSQLBook::CreateControls()
m_Explain->SetColLabelSize(25);
m_Explain->SetRowLabelSize(50);

wxBitmap m_ExplainBitmap(wxGetApp().GetBmp(ID_BMP_EXPLAIN));
wxBitmapBundle m_ExplainBitmap(wxGetApp().GetBmp(ID_BMP_EXPLAIN));
m_ResultBook->AddPage(m_Explain, _("Explain"), false, m_ExplainBitmap);

GetAuiManager().AddPane(m_ResultBook,
Expand Down
94 changes: 49 additions & 45 deletions src/sqliteplusframe.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ pour plus de détails.
#include <wx/frame.h>
#include <wx/statusbr.h>
#include <wx/toolbar.h>
#include <wx/artprov.h>
/*---------------------------------------------------------------------------*/
#include "sqliteplusframe.h"
#include "wxsqliteplusapp.h"
Expand Down Expand Up @@ -274,23 +275,22 @@ void wxSQLitePlusFrame::Init()

InitNodeParams();

m_TreeImageList.Create(16, 16);
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_DATABASE));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_TABLES));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_VIEWS));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_INDEXES));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_TRIGGERS2));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_TABLE));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_TABLE_TMP));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_VIEW));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_VIEW_TMP));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_INDEXE));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_INDEXE_TMP));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_TRIGGER2));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_TRIGGER2_TMP));
m_TreeImageList.Add(wxGetApp().GetBmp(ID_BMP_FIELD));

// Accelerators
m_images.push_back(wxGetApp().GetBmp(ID_BMP_DATABASE));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_TABLES));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_VIEWS));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_INDEXES));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_TRIGGERS2));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_TABLE));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_TABLE_TMP));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_VIEW));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_VIEW_TMP));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_INDEXE));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_INDEXE_TMP));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_TRIGGER2));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_TRIGGER2_TMP));
m_images.push_back(wxGetApp().GetBmp(ID_BMP_FIELD));

wxAcceleratorEntry entries[5];

entries[0].Set(wxACCEL_CTRL, 'E', ID_MNU_EXECUTESQL);
Expand Down Expand Up @@ -379,7 +379,7 @@ void wxSQLitePlusFrame::CreateControls()

GetAuiManager().Update();

m_TreeCtrl->SetImageList(&m_TreeImageList);
m_TreeCtrl->SetImages(m_images);
int widths[3] = {-1, 70, 170};
SetStatusWidths(3, widths);
SetStatusText("v" + wxGetApp().GetFileVersion() + "/" + m_db.GetVersion() + "/" + wxVERSION_STRING, 2);
Expand Down Expand Up @@ -539,25 +539,25 @@ void wxSQLitePlusFrame::CreateMenus()
/*---------------------------------------------------------------------------*/
void wxSQLitePlusFrame::CreateToolbars()
{
wxBitmap BitmapDisabled;
wxBitmap BitmapDisabled = wxArtProvider::GetBitmap(wxART_MISSING_IMAGE, wxART_TOOLBAR);;

m_TbFile = new wxToolBar(this, ID_TB_FILE, wxDefaultPosition, wxDefaultSize,
wxTB_FLAT|wxTB_HORIZONTAL|wxTB_NODIVIDER);

wxBitmap bmp1(wxGetApp().GetBmp(ID_BMP_OPENDB));
m_TbFile->SetToolBitmapSize(wxSize(32, 32));
wxBitmapBundle bmp1(wxGetApp().GetBmp(ID_BMP_OPENDB));
m_TbFile->AddTool(wxID_OPEN, wxEmptyString, bmp1, BitmapDisabled,
wxITEM_NORMAL, _("Open/Create Database"),
_("Open an existing database or create a new database"));
wxBitmap bmp2(wxGetApp().GetBmp(ID_BMP_ATTACH));
wxBitmapBundle bmp2(wxGetApp().GetBmp(ID_BMP_ATTACH));
m_TbFile->AddTool(ID_MNU_ATTACH_DB, wxEmptyString, bmp2, BitmapDisabled,
wxITEM_NORMAL, _("Attach Database"),
_("Attach an existing or new database"));
wxBitmap bmp3(wxGetApp().GetBmp(ID_BMP_COMPACTDB));
wxBitmapBundle bmp3(wxGetApp().GetBmp(ID_BMP_COMPACTDB));
m_TbFile->AddTool(ID_MNU_COMPACT, wxEmptyString, bmp3, BitmapDisabled,
wxITEM_NORMAL, _("Compact Database"),
_("Delete empty space in database"));
m_TbFile->EnableTool(ID_MNU_COMPACT, false);
wxBitmap bmp4(wxGetApp().GetBmp(ID_BMP_REFRESH));
wxBitmapBundle bmp4(wxGetApp().GetBmp(ID_BMP_REFRESH));
m_TbFile->AddTool(ID_MNU_REFRESHALL, wxEmptyString, bmp4, BitmapDisabled,
wxITEM_NORMAL, _("Refresh Structure"),
_("Refresh all database structure"));
Expand All @@ -576,25 +576,26 @@ void wxSQLitePlusFrame::CreateToolbars()

m_TbEdit = new wxToolBar(this, ID_TB_EDIT, wxDefaultPosition, wxDefaultSize,
wxTB_FLAT|wxTB_HORIZONTAL|wxTB_NODIVIDER);
wxBitmap bmp5(wxGetApp().GetBmp(ID_BMP_UNDO));
m_TbEdit->SetToolBitmapSize(wxSize(32, 32));
wxBitmapBundle bmp5(wxGetApp().GetBmp(ID_BMP_UNDO));
m_TbEdit->AddTool(wxID_UNDO, wxEmptyString, bmp5, BitmapDisabled,
wxITEM_NORMAL, _("Undo"), _("Undo the last editor action"));
wxBitmap bmp6(wxGetApp().GetBmp(ID_BMP_REDO));
wxBitmapBundle bmp6(wxGetApp().GetBmp(ID_BMP_REDO));
m_TbEdit->AddTool(wxID_REDO, wxEmptyString, bmp6, BitmapDisabled,
wxITEM_NORMAL, _("Redo"), _("Redo the last editor action"));
m_TbEdit->AddSeparator();
wxBitmap bmp7(wxGetApp().GetBmp(ID_BMP_CUT));
wxBitmapBundle bmp7(wxGetApp().GetBmp(ID_BMP_CUT));
m_TbEdit->AddTool(wxID_CUT, wxEmptyString, bmp7, BitmapDisabled,
wxITEM_NORMAL, _("Cut"), _("Cut the selected text"));
wxBitmap bmp8(wxGetApp().GetBmp(ID_BMP_COPY));
wxBitmapBundle bmp8(wxGetApp().GetBmp(ID_BMP_COPY));
m_TbEdit->AddTool(wxID_COPY, wxEmptyString, bmp8, BitmapDisabled,
wxITEM_NORMAL, _("Copy"), _("Copy the selected text"));
wxBitmap bmp9(wxGetApp().GetBmp(ID_BMP_PASTE));
wxBitmapBundle bmp9(wxGetApp().GetBmp(ID_BMP_PASTE));
m_TbEdit->AddTool(wxID_PASTE, wxEmptyString, bmp9, BitmapDisabled,
wxITEM_NORMAL, _("Paste"),
_("Paste in the editor the text in the clipboard"));
m_TbEdit->AddSeparator();
wxBitmap bmp10(wxGetApp().GetBmp(ID_BMP_CLEAR));
wxBitmapBundle bmp10(wxGetApp().GetBmp(ID_BMP_CLEAR));
m_TbEdit->AddTool(wxID_CLEAR, wxEmptyString, bmp10, BitmapDisabled,
wxITEM_NORMAL, _("Clear"),
_("Delete the selected text"));
Expand All @@ -613,16 +614,17 @@ void wxSQLitePlusFrame::CreateToolbars()

m_TbQuery = new wxToolBar(this, ID_TBQUERY, wxDefaultPosition, wxDefaultSize,
wxTB_FLAT|wxTB_HORIZONTAL|wxTB_NODIVIDER);
wxBitmap bmp11(wxGetApp().GetBmp(ID_BMP_RUNSQL));
m_TbQuery->SetToolBitmapSize(wxSize(32, 32));
wxBitmapBundle bmp11(wxGetApp().GetBmp(ID_BMP_RUNSQL));
m_TbQuery->AddTool(ID_MNU_EXECUTESQL, wxEmptyString, bmp11, BitmapDisabled,
wxITEM_NORMAL, _("Execute SQL"),
_("Execute the current SQL statement"));
wxBitmap bmp12(wxGetApp().GetBmp(ID_BMP_RUNSCRIPT));
wxBitmapBundle bmp12(wxGetApp().GetBmp(ID_BMP_RUNSCRIPT));
m_TbQuery->AddTool(ID_MNU_EXECUTESCRIPT, wxEmptyString, bmp12, BitmapDisabled,
wxITEM_NORMAL, _("Execute script"),
_("Execute the SQL script"));
m_TbQuery->AddSeparator();
wxBitmap bmp13(wxGetApp().GetBmp(ID_BMP_EXPLAIN));
wxBitmapBundle bmp13(wxGetApp().GetBmp(ID_BMP_EXPLAIN));
m_TbQuery->AddTool(ID_MNU_EXPLAIN, wxEmptyString, bmp13, BitmapDisabled,
wxITEM_NORMAL, _("Explain"),
_("Explain the current SQL statement"));
Expand All @@ -641,25 +643,26 @@ void wxSQLitePlusFrame::CreateToolbars()
m_TbTransact = new wxToolBar(this, ID_TB_TRANSACT, wxDefaultPosition,
wxDefaultSize,
wxTB_FLAT|wxTB_HORIZONTAL|wxTB_NODIVIDER);
wxBitmap bmp14(wxGetApp().GetBmp(ID_BMP_STARTTRANSACT));
m_TbTransact->SetToolBitmapSize(wxSize(32, 32));
wxBitmapBundle bmp14(wxGetApp().GetBmp(ID_BMP_STARTTRANSACT));
m_TbTransact->AddTool(ID_MNU_BEGINTRANSACT, wxEmptyString, bmp14,
BitmapDisabled, wxITEM_NORMAL, _("Begin Transaction"),
_("Begin a new transaction"));
wxBitmap bmp15(wxGetApp().GetBmp(ID_BMP_STOPTRANSACT));
wxBitmapBundle bmp15(wxGetApp().GetBmp(ID_BMP_STOPTRANSACT));
m_TbTransact->AddTool(ID_MNU_ENDTRANSACT, wxEmptyString, bmp15,
BitmapDisabled, wxITEM_NORMAL, _("End Transaction"),
_("Stop the current transaction"));
m_TbTransact->AddSeparator();
wxBitmap bmp16(wxGetApp().GetBmp(ID_BMP_COMMIT));
wxBitmapBundle bmp16(wxGetApp().GetBmp(ID_BMP_COMMIT));
m_TbTransact->AddTool(ID_MNU_COMMIT, wxEmptyString, bmp16, BitmapDisabled,
wxITEM_NORMAL, _("Commit"),
_("Commit the current transaction"));
wxBitmap bmp17(wxGetApp().GetBmp(ID_BMP_ROLLBACK));
wxBitmapBundle bmp17(wxGetApp().GetBmp(ID_BMP_ROLLBACK));
m_TbTransact->AddTool(ID_MNU_ROLLBACK, wxEmptyString, bmp17, BitmapDisabled,
wxITEM_NORMAL, _("Rollback"),
_("Rollback the current transaction"));
m_TbTransact->AddSeparator();
wxBitmap bmp18(wxGetApp().GetBmp(ID_BMP_AUTOTRANSACT));
wxBitmapBundle bmp18(wxGetApp().GetBmp(ID_BMP_AUTOTRANSACT));
m_TbTransact->AddTool(ID_MNU_AUTOTRANSACT, wxEmptyString, bmp18,
BitmapDisabled, wxITEM_CHECK,
_("Auto Start Transaction"),
Expand All @@ -680,38 +683,39 @@ void wxSQLitePlusFrame::CreateToolbars()
m_TbDatabase = new wxToolBar(this, ID_MNU_TB_DATABASE, wxDefaultPosition,
wxDefaultSize,
wxTB_FLAT|wxTB_HORIZONTAL|wxTB_NODIVIDER);
wxBitmap bmp19(wxGetApp().GetBmp(ID_BMP_TABLECREATE));
m_TbDatabase->SetToolBitmapSize(wxSize(32, 32));
wxBitmapBundle bmp19(wxGetApp().GetBmp(ID_BMP_TABLECREATE));
m_TbDatabase->AddTool(ID_MNU_ADD_TABLE, wxEmptyString, bmp19, BitmapDisabled,
wxITEM_NORMAL, _("Create Table"),
_("Show dialog to create new table"));
wxBitmap bmp20(wxGetApp().GetBmp(ID_BMP_TABLEDROP));
wxBitmapBundle bmp20(wxGetApp().GetBmp(ID_BMP_TABLEDROP));
m_TbDatabase->AddTool(ID_MNU_DEL_TABLE, wxEmptyString, bmp20, BitmapDisabled,
wxITEM_NORMAL, _("Drop Table"),
_("Show dialog to delete table"));
m_TbDatabase->AddSeparator();
wxBitmap bmp21(wxGetApp().GetBmp(ID_BMP_VIEWCREATE));
wxBitmapBundle bmp21(wxGetApp().GetBmp(ID_BMP_VIEWCREATE));
m_TbDatabase->AddTool(ID_MNU_ADD_VIEW, wxEmptyString, bmp21, BitmapDisabled,
wxITEM_NORMAL, _("Create View"),
_("Show dialog to create new view"));
wxBitmap bmp22(wxGetApp().GetBmp(ID_BMP_VIEWDROP));
wxBitmapBundle bmp22(wxGetApp().GetBmp(ID_BMP_VIEWDROP));
m_TbDatabase->AddTool(ID_MNU_DEL_VIEW, wxEmptyString, bmp22, BitmapDisabled,
wxITEM_NORMAL, _("Drop View"),
_("Show dialog to delete view"));
m_TbDatabase->AddSeparator();
wxBitmap bmp23(wxGetApp().GetBmp(ID_BMP_INDEXECREATE));
wxBitmapBundle bmp23(wxGetApp().GetBmp(ID_BMP_INDEXECREATE));
m_TbDatabase->AddTool(ID_MNU_ADD_INDEX, wxEmptyString, bmp23, BitmapDisabled,
wxITEM_NORMAL, _("Create Index"),
_("Show dialog to create new index"));
wxBitmap bmp24(wxGetApp().GetBmp(ID_BMP_INDEXEDROP));
wxBitmapBundle bmp24(wxGetApp().GetBmp(ID_BMP_INDEXEDROP));
m_TbDatabase->AddTool(ID_MNU_DEL_INDEX, wxEmptyString, bmp24, BitmapDisabled,
wxITEM_NORMAL, _("Drop Index"),
_("Show dialog to delete index"));
m_TbDatabase->AddSeparator();
wxBitmap bmp25(wxGetApp().GetBmp(ID_BMP_TRIGGERCREATE));
wxBitmapBundle bmp25(wxGetApp().GetBmp(ID_BMP_TRIGGERCREATE));
m_TbDatabase->AddTool(ID_MNU_ADD_TRIGGER, wxEmptyString, bmp25,
BitmapDisabled, wxITEM_NORMAL, _("Create Trigger"),
_("Show dialog to create new trigger"));
wxBitmap bmp26(wxGetApp().GetBmp(ID_BMP_TRIGGERDROP));
wxBitmapBundle bmp26(wxGetApp().GetBmp(ID_BMP_TRIGGERDROP));
m_TbDatabase->AddTool(ID_MNU_DEL_TRIGGER, wxEmptyString, bmp26,
BitmapDisabled, wxITEM_NORMAL, _("Drop Trigger"),
_("Show dialog to delete trigger"));
Expand Down
3 changes: 1 addition & 2 deletions src/sqliteplusframe.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ pour plus de détails.
#include <wx/treectrl.h>
#include <wx/aui/auibook.h>
#include <wx/socket.h>
#include <wx/imaglist.h>
#include "sqlite3table.h"
/*---------------------------------------------------------------------------*/
class wxTreeCtrl;
Expand Down Expand Up @@ -172,7 +171,7 @@ class wxSQLitePlusFrame: public wxFrame

wxSQLite3Database m_db;
SQLite3HookForCount m_Hook;
wxImageList m_TreeImageList;
wxVector<wxBitmapBundle > m_images;
wxString m_DbName;
int m_NodeType;
wxString m_NodeText;
Expand Down
Loading

0 comments on commit ac9637f

Please sign in to comment.