amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove some useless "typedef wxX X"

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-04-22 23:58:01 +02:00
parent 713a9e4a40
commit a585fc40cc
9 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/set/cards_panel.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ CardsPanel::CardsPanel(Window* parent, int id)
editor = new CardEditor(this, ID_EDITOR);
splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
card_list = new FilteredImageCardList(splitter, ID_CARD_LIST);
nodes_panel = new Panel(splitter, wxID_ANY);
nodes_panel = new wxPanel(splitter, wxID_ANY);
notes = new TextCtrl(nodes_panel, ID_NOTES, true);
collapse_notes = new HoverButton(nodes_panel, ID_COLLAPSE_NOTES, _("btn_collapse"), wxNullColour, false);
collapse_notes->SetExtraStyle(wxWS_EX_PROCESS_UI_UPDATES);
src/gui/set/cards_panel.hpp
+1 -1
View File
@@ -78,7 +78,7 @@ class CardsPanel : public SetWindowPanel {
wxSplitterWindow* splitter;
DataEditor* editor;
FilteredImageCardList* card_list;
Panel* nodes_panel;
wxPanel* nodes_panel;
TextCtrl* notes;
HoverButton* collapse_notes;
FilterCtrl* filter;
src/gui/set/console_panel.cpp
+1 -1
View File
@@ -301,7 +301,7 @@ ConsolePanel::ConsolePanel(Window* parent, int id)
// init controls
splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
messages = new MessageCtrl(splitter, ID_MESSAGE_LIST);
entry_panel = new Panel(splitter, wxID_ANY);
entry_panel = new wxPanel(splitter, wxID_ANY);
entry = new wxTextCtrl(entry_panel, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
wxButton* evaluate = new wxButton(entry_panel, ID_EVALUATE, _BUTTON_("evaluate"));
// init sizer for entry_panel
src/gui/set/keywords_panel.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ void KeywordsPanel::initControls() {
// init controls
splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
list = new KeywordList(splitter, ID_KEYWORD_LIST);
panel = new Panel(splitter, wxID_ANY);
panel = new wxPanel(splitter, wxID_ANY);
keyword = new TextCtrl(panel, ID_KEYWORD, false);
mode = new wxChoice(panel, ID_KEYWORD_MODE, wxDefaultPosition, wxDefaultSize, 0, nullptr);
match = new TextCtrl(panel, ID_MATCH, false);
src/gui/symbol/window.hpp
+1 -1
View File
@@ -20,7 +20,7 @@ DECLARE_POINTER_TYPE(ValueActionPerformer);
// ----------------------------------------------------------------------------- : SymbolWindow
/// The window for editing symbols
class SymbolWindow : public Frame {
class SymbolWindow : public wxFrame {
public:
/// Construct a SymbolWindow
SymbolWindow(Window* parent);
src/gui/welcome_window.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
// ----------------------------------------------------------------------------- : WelcomeWindow
WelcomeWindow::WelcomeWindow()
: Frame(nullptr, wxID_ANY, _TITLE_("magic set editor"), wxDefaultPosition, wxSize(520,380), wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL | wxCLIP_CHILDREN )
: wxFrame(nullptr, wxID_ANY, _TITLE_("magic set editor"), wxDefaultPosition, wxSize(520,380), wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL | wxCLIP_CHILDREN )
, logo (load_resource_image(_("about")))
#if USE_BETA_LOGO
, logo2(load_resource_image(_("two_beta")))
src/gui/welcome_window.hpp
+1 -1
View File
@@ -24,7 +24,7 @@ DECLARE_POINTER_TYPE(Set);
* in the future also:
* - new game, new style?
*/
class WelcomeWindow : public Frame {
class WelcomeWindow : public wxFrame {
public:
WelcomeWindow();