Skip to content

Commit

Permalink
Updated SFTP and DBExplorer plugins to use the new SVG bitmaps
Browse files Browse the repository at this point in the history
  • Loading branch information
@eranif
eranif committed Nov 10, 2015
1 parent f769446 commit 6f2f2db
Show file tree
Hide file tree
Showing 37 changed files with 3,963 additions and 813 deletions.
44 changes: 22 additions & 22 deletions DatabaseExplorer/DbViewerPanel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,39 +67,39 @@ DbViewerPanel::DbViewerPanel(wxWindow* parent, wxWindow* notebook, IManager* pMa

m_auibar->AddTool(XRCID("IDT_DBE_CONNECT"),
_("Open connection"),
bmpLoader->LoadBitmap(wxT("db-explorer/16/connect")),
bmpLoader->LoadBitmap("plus"),
wxNullBitmap,
wxITEM_NORMAL,
_("Open new connection"),
_("Open new connection"),
NULL);
m_auibar->AddTool(XRCID("IDT_DBE_CLOSE_CONNECTION"),
_("tool"),
bmpLoader->LoadBitmap(wxT("db-explorer/16/disconnect")),
bmpLoader->LoadBitmap("minus"),
wxNullBitmap,
wxITEM_NORMAL,
_("Close selected connection"),
_("Close selected connection"),
NULL);
m_auibar->AddTool(XRCID("IDT_DBE_REFRESH"),
_("tool"),
bmpLoader->LoadBitmap(wxT("db-explorer/16/database_refresh")),
bmpLoader->LoadBitmap("debugger_restart"),
wxNullBitmap,
wxITEM_NORMAL,
_("Refresh View"),
wxEmptyString,
NULL);
m_auibar->AddTool(XRCID("IDT_DBE_ERD"),
_("ERD"),
bmpLoader->LoadBitmap(wxT("db-explorer/16/table")),
bmpLoader->LoadBitmap("folder-templates"),
wxNullBitmap,
wxITEM_NORMAL,
_("Open ERD View"),
wxEmptyString,
NULL)->SetHasDropDown(true);
NULL)->SetHasDropDown(true);
m_auibar->AddTool(XRCID("IDT_DBE_PREVIEW"),
_("Show ERD Thumbnail"),
bmpLoader->LoadBitmap(wxT("db-explorer/16/thumbnail")),
bmpLoader->LoadBitmap("find"),
_("Show ERD Thumbnail"),
wxITEM_CHECK);
m_auibar->Realize();
Expand All @@ -108,8 +108,8 @@ DbViewerPanel::DbViewerPanel(wxWindow* parent, wxWindow* notebook, IManager* pMa

m_mgr->GetEditorPaneNotebook()->Bind(wxEVT_BOOK_PAGE_CHANGED, &DbViewerPanel::OnPageChanged, this);
m_mgr->GetEditorPaneNotebook()->Bind(wxEVT_BOOK_PAGE_CLOSING, &DbViewerPanel::OnPageClosing, this);
m_auibar->Bind(wxEVT_AUITOOLBAR_TOOL_DROPDOWN, &DbViewerPanel::OnERDSelected, this, XRCID("IDT_DBE_ERD"));

m_auibar->Bind(wxEVT_AUITOOLBAR_TOOL_DROPDOWN, &DbViewerPanel::OnERDSelected, this, XRCID("IDT_DBE_ERD"));

this->Connect(
XRCID("IDT_DBE_CONNECT"), wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(DbViewerPanel::OnConnectClick));
Expand Down Expand Up @@ -968,20 +968,20 @@ void DbViewerPanel::AddEditorPage(wxWindow* page, const wxString& name)
page->SetFocus();
}
}


void DbViewerPanel::OnERDSelected(wxAuiToolBarEvent& event)
{
wxMenu menu;
menu.Append( XRCID("IDM_DBE_ERD_SQLITE"), _("SQLite") );
menu.Append( XRCID("IDM_DBE_ERD_MYSQL"), _("MySQL") );
menu.Append( XRCID("IDM_DBE_ERD_POSTGRESQL"), _("PostgreSQL") );
int selection = GetPopupMenuSelectionFromUser( menu, event.GetItemRect().GetBottomLeft() );
if( selection == XRCID("IDM_DBE_ERD_SQLITE") ) {
m_mgr->AddEditorPage( new ErdPanel( m_pNotebook, new SQLiteDbAdapter(), m_pConnections ), _("SQLite ERD") );
} else if( selection == XRCID("IDM_DBE_ERD_MYSQL") ) {
m_mgr->AddEditorPage( new ErdPanel( m_pNotebook, new MySqlDbAdapter(), m_pConnections ), _("MySQL ERD") );
} else if( selection == XRCID("IDM_DBE_ERD_POSTGRESQL") ) {
m_mgr->AddEditorPage( new ErdPanel( m_pNotebook, new PostgreSqlDbAdapter(), m_pConnections ), _("PostgreSQL ERD") );
{
wxMenu menu;
menu.Append(XRCID("IDM_DBE_ERD_SQLITE"), _("SQLite"));
menu.Append(XRCID("IDM_DBE_ERD_MYSQL"), _("MySQL"));
menu.Append(XRCID("IDM_DBE_ERD_POSTGRESQL"), _("PostgreSQL"));

int selection = GetPopupMenuSelectionFromUser(menu, event.GetItemRect().GetBottomLeft());
if(selection == XRCID("IDM_DBE_ERD_SQLITE")) {
m_mgr->AddEditorPage(new ErdPanel(m_pNotebook, new SQLiteDbAdapter(), m_pConnections), _("SQLite ERD"));
} else if(selection == XRCID("IDM_DBE_ERD_MYSQL")) {
m_mgr->AddEditorPage(new ErdPanel(m_pNotebook, new MySqlDbAdapter(), m_pConnections), _("MySQL ERD"));
} else if(selection == XRCID("IDM_DBE_ERD_POSTGRESQL")) {
m_mgr->AddEditorPage(new ErdPanel(m_pNotebook, new PostgreSqlDbAdapter(), m_pConnections), _("PostgreSQL ERD"));
}
}
74 changes: 38 additions & 36 deletions DatabaseExplorer/GUI.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ _ImageExportDialog::_ImageExportDialog(wxWindow* parent, wxWindowID id, const wx
m_sdbSizer2->Realize();

SetName(wxT("_ImageExportDialog"));
SetSizeHints(-1,-1);
SetSize(-1,-1);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down Expand Up @@ -136,7 +136,7 @@ _ThumbPane::_ThumbPane(wxWindow* parent, wxWindowID id, const wxPoint& pos, cons
this->SetSizer(mainSizer);

SetName(wxT("_ThumbPane"));
SetSizeHints(500,300);
SetSize(500,300);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down Expand Up @@ -168,24 +168,30 @@ _SqlCommandPanel::_SqlCommandPanel(wxWindow* parent, wxWindowID id, const wxPoin

fgSizer3->Add(m_auibar167, 0, wxEXPAND, 5);

m_auibar167->AddTool(wxID_ANY, _("Load..."), wxXmlResource::Get()->LoadBitmap(wxT("document-open")), wxNullBitmap, wxITEM_NORMAL, _("Load..."), _("Load..."), NULL);
m_auibar167->AddTool(wxID_ANY, _("Load..."), wxXmlResource::Get()->LoadBitmap(wxT("16-file_open")), wxNullBitmap, wxITEM_NORMAL, _("Load..."), _("Load..."), NULL);

m_auibar167->AddTool(XRCID("IDC_DBE_SQL_SAVE"), _("Save..."), wxXmlResource::Get()->LoadBitmap(wxT("document-save")), wxNullBitmap, wxITEM_NORMAL, _("Save..."), _("Save..."), NULL);
m_auibar167->AddTool(XRCID("IDC_DBE_SQL_SAVE"), _("Save..."), wxXmlResource::Get()->LoadBitmap(wxT("16-file_save")), wxNullBitmap, wxITEM_NORMAL, _("Save..."), _("Save..."), NULL);

m_auibar167->AddTool(XRCID("IDC_DBE_SQL_EXEC"), _("Execute SQL"), wxXmlResource::Get()->LoadBitmap(wxT("execute")), wxNullBitmap, wxITEM_NORMAL, _("Execute SQL"), wxT(""), NULL);
m_auibar167->AddTool(XRCID("IDC_DBE_SQL_EXEC"), _("Execute SQL"), wxXmlResource::Get()->LoadBitmap(wxT("16-executable")), wxNullBitmap, wxITEM_NORMAL, _("Execute SQL"), wxT(""), NULL);

m_auibar167->AddSeparator();

m_auibar167->AddTool(ID_INSERT_TEMPLATE, _("Insert template"), wxXmlResource::Get()->LoadBitmap(wxT("add")), wxNullBitmap, wxITEM_NORMAL, _("Insert template"), _("Insert template"), NULL);
m_auibar167->AddTool(ID_INSERT_TEMPLATE, _("Insert template"), wxXmlResource::Get()->LoadBitmap(wxT("16-plus")), wxNullBitmap, wxITEM_NORMAL, _("Insert template"), _("Insert template"), NULL);
wxAuiToolBarItem* m_toolbarItemTemplates = m_auibar167->FindToolByIndex(m_auibar167->GetToolCount()-1);
if (m_toolbarItemTemplates) {
m_toolbarItemTemplates->SetHasDropDown(true);
m_menu183 = new wxMenu;

m_dropdownMenus.insert(std::make_pair( m_toolbarItemTemplates->GetId(), m_menu183) );
}

m_auibar167->AddTool(ID_SQL_HISTORY, _("SQL History"), wxXmlResource::Get()->LoadBitmap(wxT("history")), wxNullBitmap, wxITEM_NORMAL, _("SQL History"), _("SQL History"), NULL);
m_auibar167->AddTool(ID_SQL_HISTORY, _("SQL History"), wxXmlResource::Get()->LoadBitmap(wxT("16-history")), wxNullBitmap, wxITEM_NORMAL, _("SQL History"), _("SQL History"), NULL);
wxAuiToolBarItem* m_toolHistory = m_auibar167->FindToolByIndex(m_auibar167->GetToolCount()-1);
if (m_toolHistory) {
m_toolHistory->SetHasDropDown(true);
m_menu184 = new wxMenu;

m_dropdownMenus.insert(std::make_pair( m_toolHistory->GetId(), m_menu184) );
}
m_auibar167->Realize();

Expand Down Expand Up @@ -264,7 +270,7 @@ _SqlCommandPanel::_SqlCommandPanel(wxWindow* parent, wxWindowID id, const wxPoin
bSizer24->Add(m_labelStatus, 0, wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);

SetName(wxT("_SqlCommandPanel"));
SetSizeHints(-1,-1);
SetSize(-1,-1);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down Expand Up @@ -345,7 +351,7 @@ _AdapterSelectDlg::_AdapterSelectDlg(wxWindow* parent, wxWindowID id, const wxSt
bSizer9->Add(m_button24, 1, wxALL|wxEXPAND, 5);

SetName(wxT("_AdapterSelectDlg"));
SetSizeHints(-1,-1);
SetSize(-1,-1);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down Expand Up @@ -392,7 +398,7 @@ _DbViewerPanel::_DbViewerPanel(wxWindow* parent, wxWindowID id, const wxPoint& p
bSizer28->Add(m_treeDatabases, 1, wxEXPAND, 5);

SetName(wxT("_DbViewerPanel"));
SetSizeHints(200,100);
SetSize(200,100);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down Expand Up @@ -449,7 +455,7 @@ _DBSettingsDialog::_DBSettingsDialog(wxWindow* parent, wxWindowID id, const wxSt

fgSizer41->Add(m_staticText11, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);

m_filePickerSqlite = new wxFilePickerCtrl(m_Sqlite, wxID_ANY, wxEmptyString, _("Select a file"), wxT("All Files (*)|*|Database file (*.sqlite;*.tags;*.db)|*.sqlite;*.tags;*.db"), wxDefaultPosition, wxSize(-1,-1), wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
m_filePickerSqlite = new wxFilePickerCtrl(m_Sqlite, wxID_ANY, wxEmptyString, _("Select a file"), wxT("All Files (*)|*|Database file (*.sqlite;*.tags;*.db)|*.sqlite;*.tags;*.db"), wxDefaultPosition, wxSize(-1,-1), wxFLP_USE_TEXTCTRL|wxFLP_SMALL|wxFLP_OPEN);
m_filePickerSqlite->SetFocus();

fgSizer41->Add(m_filePickerSqlite, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
Expand Down Expand Up @@ -634,7 +640,7 @@ _DBSettingsDialog::_DBSettingsDialog(wxWindow* parent, wxWindowID id, const wxSt
#endif

SetName(wxT("_DBSettingsDialog"));
SetSizeHints(-1,-1);
SetSize(-1,-1);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down Expand Up @@ -700,7 +706,7 @@ _ErdPanel::_ErdPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos, const
fgSizer7->AddGrowableRow(1);
this->SetSizer(fgSizer7);

m_toolBarErd = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_DEFAULT_STYLE);
m_toolBarErd = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_PLAIN_BACKGROUND|wxAUI_TB_DEFAULT_STYLE);
m_toolBarErd->SetToolBitmapSize(wxSize(16,16));

fgSizer7->Add(m_toolBarErd, 0, wxEXPAND, 5);
Expand All @@ -713,7 +719,7 @@ _ErdPanel::_ErdPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos, const
m_wxsfPanel->SetSizer(m_wxsfSizer);

SetName(wxT("_ErdPanel"));
SetSizeHints(640,480);
SetSize(640,480);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down Expand Up @@ -844,7 +850,7 @@ _CreateForeignKey::_CreateForeignKey(wxWindow* parent, wxWindowID id, const wxSt
bSizer12->Add(m_btnOK, 1, wxALL|wxEXPAND, 5);

SetName(wxT("_CreateForeignKey"));
SetSizeHints(-1,-1);
SetSize(-1,-1);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down Expand Up @@ -910,8 +916,8 @@ _LogDialog::_LogDialog(wxWindow* parent, wxWindowID id, const wxString& title, c
bSizer13->Add(m_button18, 0, wxLEFT|wxRIGHT|wxTOP|wxALIGN_RIGHT, 5);

SetName(wxT("_LogDialog"));
SetMinSize(wxSize(640,460));
SetSizeHints(640,460);
SetMinClientSize(wxSize(640,460));
SetSize(640,460);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down Expand Up @@ -1028,8 +1034,8 @@ _ViewSettings::_ViewSettings(wxWindow* parent, wxWindowID id, const wxString& ti
fgSizer14->Add(m_btnOK, 0, wxALL|wxALIGN_RIGHT, 5);

SetName(wxT("_ViewSettings"));
SetMinSize(wxSize(650,450));
SetSizeHints(650,450);
SetMinClientSize(wxSize(650,450));
SetSize(650,450);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down Expand Up @@ -1164,7 +1170,7 @@ _ClassGenerateDialog::_ClassGenerateDialog(wxWindow* parent, wxWindowID id, cons
bSizer20->Add(m_button25, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);

SetName(wxT("_ClassGenerateDialog"));
SetSizeHints(-1,-1);
SetSize(-1,-1);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down Expand Up @@ -1260,8 +1266,8 @@ _CodePreviewDialog::_CodePreviewDialog(wxWindow* parent, wxWindowID id, const wx
boxSizer10->Add(m_button14, 0, wxALL|wxALIGN_RIGHT, 5);

SetName(wxT("_CodePreviewDialog"));
SetMinSize(wxSize(500,470));
SetSizeHints(500,470);
SetMinClientSize(wxSize(500,470));
SetSize(500,470);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down Expand Up @@ -1336,20 +1342,20 @@ _TableSettings::_TableSettings(wxWindow* parent, wxWindowID id, const wxString&

boxSizer37->Add(m_staticText55, 0, wxLEFT|wxRIGHT|wxTOP, 5);

m_auibar39 = new wxAuiToolBar(m_splitterPage31, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_DEFAULT_STYLE);
m_auibar39 = new wxAuiToolBar(m_splitterPage31, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_PLAIN_BACKGROUND|wxAUI_TB_DEFAULT_STYLE);
m_auibar39->SetToolBitmapSize(wxSize(16,16));

boxSizer37->Add(m_auibar39, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5);

m_auibar39->AddTool(XRCID("IDT_DBE_TS_ADD_COLUMN"), _("Add column"), wxXmlResource::Get()->LoadBitmap(wxT("add")), wxNullBitmap, wxITEM_NORMAL, _("Add new column"), wxT(""), NULL);
m_auibar39->AddTool(XRCID("IDT_DBE_TS_ADD_COLUMN"), _("Add column"), wxXmlResource::Get()->LoadBitmap(wxT("16-plus")), wxNullBitmap, wxITEM_NORMAL, _("Add new column"), wxT(""), NULL);

m_auibar39->AddTool(XRCID("IDT_DBE_TS_REMOVE_COLUMN"), _("Remove column"), wxXmlResource::Get()->LoadBitmap(wxT("delete")), wxNullBitmap, wxITEM_NORMAL, _("Remove selected column"), wxT(""), NULL);
m_auibar39->AddTool(XRCID("IDT_DBE_TS_REMOVE_COLUMN"), _("Remove column"), wxXmlResource::Get()->LoadBitmap(wxT("16-minus")), wxNullBitmap, wxITEM_NORMAL, _("Remove selected column"), wxT(""), NULL);

m_auibar39->AddSeparator();

m_auibar39->AddTool(XRCID("IDT_DBE_TS_MOVE_UP"), _("Move column up"), wxXmlResource::Get()->LoadBitmap(wxT("move-up")), wxNullBitmap, wxITEM_NORMAL, _("Move selected column up"), wxT(""), NULL);
m_auibar39->AddTool(XRCID("IDT_DBE_TS_MOVE_UP"), _("Move column up"), wxXmlResource::Get()->LoadBitmap(wxT("16-up")), wxNullBitmap, wxITEM_NORMAL, _("Move selected column up"), wxT(""), NULL);

m_auibar39->AddTool(XRCID("IDT_DBE_TS_MOVE_DOWN"), _("Move column down"), wxXmlResource::Get()->LoadBitmap(wxT("move-down")), wxNullBitmap, wxITEM_NORMAL, _("Move selected column down"), wxT(""), NULL);
m_auibar39->AddTool(XRCID("IDT_DBE_TS_MOVE_DOWN"), _("Move column down"), wxXmlResource::Get()->LoadBitmap(wxT("16-down")), wxNullBitmap, wxITEM_NORMAL, _("Move selected column down"), wxT(""), NULL);
m_auibar39->Realize();

m_dvColumns = new wxDataViewListCtrl(m_splitterPage31, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxDV_ROW_LINES|wxDV_SINGLE);
Expand All @@ -1372,14 +1378,14 @@ _TableSettings::_TableSettings(wxWindow* parent, wxWindowID id, const wxString&

boxSizer43->Add(m_staticText57, 0, wxLEFT|wxRIGHT|wxTOP, 5);

m_auibar45 = new wxAuiToolBar(m_splitterPage35, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_DEFAULT_STYLE);
m_auibar45 = new wxAuiToolBar(m_splitterPage35, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxAUI_TB_PLAIN_BACKGROUND|wxAUI_TB_DEFAULT_STYLE);
m_auibar45->SetToolBitmapSize(wxSize(16,16));

boxSizer43->Add(m_auibar45, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5);

m_auibar45->AddTool(XRCID("IDT_DBE_TS_ADD_KEY"), _("Add foreign key"), wxXmlResource::Get()->LoadBitmap(wxT("add")), wxNullBitmap, wxITEM_NORMAL, _("Add new foreign key"), wxT(""), NULL);
m_auibar45->AddTool(XRCID("IDT_DBE_TS_ADD_KEY"), _("Add foreign key"), wxXmlResource::Get()->LoadBitmap(wxT("16-plus")), wxNullBitmap, wxITEM_NORMAL, _("Add new foreign key"), wxT(""), NULL);

m_auibar45->AddTool(XRCID("IDT_DBE_TS_REMOVE_KEY"), _("Remove foreign key"), wxXmlResource::Get()->LoadBitmap(wxT("delete")), wxNullBitmap, wxITEM_NORMAL, _("Remove selected foreign key"), wxT(""), NULL);
m_auibar45->AddTool(XRCID("IDT_DBE_TS_REMOVE_KEY"), _("Remove foreign key"), wxXmlResource::Get()->LoadBitmap(wxT("16-minus")), wxNullBitmap, wxITEM_NORMAL, _("Remove selected foreign key"), wxT(""), NULL);
m_auibar45->Realize();

wxFlexGridSizer* flexGridSizer143 = new wxFlexGridSizer(1, 4, 0, 0);
Expand Down Expand Up @@ -1453,10 +1459,6 @@ _TableSettings::_TableSettings(wxWindow* parent, wxWindowID id, const wxString&

boxSizer163->Add(m_radioOnDelete, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5);

m_staticLine149 = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxLI_HORIZONTAL);

boxSizer19->Add(m_staticLine149, 0, wxALL|wxEXPAND, 5);

wxBoxSizer* boxSizer49 = new wxBoxSizer(wxHORIZONTAL);

boxSizer19->Add(boxSizer49, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
Expand All @@ -1470,8 +1472,8 @@ _TableSettings::_TableSettings(wxWindow* parent, wxWindowID id, const wxString&
boxSizer49->Add(m_button53, 0, wxALL, 5);

SetName(wxT("_TableSettings"));
SetMinSize(wxSize(600,-1));
SetSizeHints(600,700);
SetMinClientSize(wxSize(600,-1));
SetSize(-1,-1);
if (GetSizer()) {
GetSizer()->Fit(this);
}
Expand Down
7 changes: 3 additions & 4 deletions DatabaseExplorer/GUI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#include <wx/radiobox.h>
#include <wx/infobar.h>
#include <wx/dataview.h>
#include <wx/statline.h>
#if wxVERSION_NUMBER >= 2900
#include <wx/persist.h>
#include <wx/persist/toplevel.h>
Expand Down Expand Up @@ -103,6 +102,8 @@ class _SqlCommandPanel : public wxPanel
protected:
wxAuiToolBar* m_auibar167;
std::map<int, wxMenu*> m_dropdownMenus;
wxMenu* m_menu183;
wxMenu* m_menu184;
wxSplitterWindow* m_splitter1;
wxPanel* m_panel13;
wxStyledTextCtrl* m_scintillaSQL;
Expand Down Expand Up @@ -441,7 +442,6 @@ class _TableSettings : public wxDialog
wxChoice* m_choiceRefCol;
wxRadioBox* m_radioOnUpdate;
wxRadioBox* m_radioOnDelete;
wxStaticLine* m_staticLine149;
wxButton* m_button51;
wxButton* m_button53;

Expand Down Expand Up @@ -489,10 +489,9 @@ class _TableSettings : public wxDialog
wxRadioBox* GetRadioOnDelete() { return m_radioOnDelete; }
wxPanel* GetSplitterPage35() { return m_splitterPage35; }
wxSplitterWindow* GetSplitter27() { return m_splitter27; }
wxStaticLine* GetStaticLine149() { return m_staticLine149; }
wxButton* GetButton51() { return m_button51; }
wxButton* GetButton53() { return m_button53; }
_TableSettings(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Table settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(600,700), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
_TableSettings(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Table settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
virtual ~_TableSettings();
};

Expand Down
Loading

0 comments on commit 6f2f2db

Please sign in to comment.