Commit b7784d43 authored by twanvl's avatar twanvl

removed some useless "typedef wxX X"

parent 97239554
...@@ -44,7 +44,7 @@ CardsPanel::CardsPanel(Window* parent, int id) ...@@ -44,7 +44,7 @@ CardsPanel::CardsPanel(Window* parent, int id)
editor = new CardEditor(this, ID_EDITOR); editor = new CardEditor(this, ID_EDITOR);
splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
card_list = new FilteredImageCardList(splitter, ID_CARD_LIST); 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); notes = new TextCtrl(nodes_panel, ID_NOTES, true);
collapse_notes = new HoverButton(nodes_panel, ID_COLLAPSE_NOTES, _("btn_collapse"), wxNullColour, false); collapse_notes = new HoverButton(nodes_panel, ID_COLLAPSE_NOTES, _("btn_collapse"), wxNullColour, false);
collapse_notes->SetExtraStyle(wxWS_EX_PROCESS_UI_UPDATES); collapse_notes->SetExtraStyle(wxWS_EX_PROCESS_UI_UPDATES);
......
...@@ -78,7 +78,7 @@ class CardsPanel : public SetWindowPanel { ...@@ -78,7 +78,7 @@ class CardsPanel : public SetWindowPanel {
wxSplitterWindow* splitter; wxSplitterWindow* splitter;
DataEditor* editor; DataEditor* editor;
FilteredImageCardList* card_list; FilteredImageCardList* card_list;
Panel* nodes_panel; wxPanel* nodes_panel;
TextCtrl* notes; TextCtrl* notes;
HoverButton* collapse_notes; HoverButton* collapse_notes;
FilterCtrl* filter; FilterCtrl* filter;
......
...@@ -301,7 +301,7 @@ ConsolePanel::ConsolePanel(Window* parent, int id) ...@@ -301,7 +301,7 @@ ConsolePanel::ConsolePanel(Window* parent, int id)
// init controls // init controls
splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
messages = new MessageCtrl(splitter, ID_MESSAGE_LIST); 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); entry = new wxTextCtrl(entry_panel, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
wxButton* evaluate = new wxButton(entry_panel, ID_EVALUATE, _BUTTON_("evaluate")); wxButton* evaluate = new wxButton(entry_panel, ID_EVALUATE, _BUTTON_("evaluate"));
// init sizer for entry_panel // init sizer for entry_panel
......
...@@ -40,7 +40,7 @@ void KeywordsPanel::initControls() { ...@@ -40,7 +40,7 @@ void KeywordsPanel::initControls() {
// init controls // init controls
splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
list = new KeywordList(splitter, ID_KEYWORD_LIST); 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); keyword = new TextCtrl(panel, ID_KEYWORD, false);
mode = new wxChoice(panel, ID_KEYWORD_MODE, wxDefaultPosition, wxDefaultSize, 0, nullptr); mode = new wxChoice(panel, ID_KEYWORD_MODE, wxDefaultPosition, wxDefaultSize, 0, nullptr);
match = new TextCtrl(panel, ID_MATCH, false); match = new TextCtrl(panel, ID_MATCH, false);
......
...@@ -20,7 +20,7 @@ DECLARE_POINTER_TYPE(ValueActionPerformer); ...@@ -20,7 +20,7 @@ DECLARE_POINTER_TYPE(ValueActionPerformer);
// ----------------------------------------------------------------------------- : SymbolWindow // ----------------------------------------------------------------------------- : SymbolWindow
/// The window for editing symbols /// The window for editing symbols
class SymbolWindow : public Frame { class SymbolWindow : public wxFrame {
public: public:
/// Construct a SymbolWindow /// Construct a SymbolWindow
SymbolWindow(Window* parent); SymbolWindow(Window* parent);
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
// ----------------------------------------------------------------------------- : WelcomeWindow // ----------------------------------------------------------------------------- : WelcomeWindow
WelcomeWindow::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"))) , logo (load_resource_image(_("about")))
#if USE_BETA_LOGO #if USE_BETA_LOGO
, logo2(load_resource_image(_("two_beta"))) , logo2(load_resource_image(_("two_beta")))
......
...@@ -24,7 +24,7 @@ DECLARE_POINTER_TYPE(Set); ...@@ -24,7 +24,7 @@ DECLARE_POINTER_TYPE(Set);
* in the future also: * in the future also:
* - new game, new style? * - new game, new style?
*/ */
class WelcomeWindow : public Frame { class WelcomeWindow : public wxFrame {
public: public:
WelcomeWindow(); WelcomeWindow();
......
...@@ -43,9 +43,7 @@ using namespace std; ...@@ -43,9 +43,7 @@ using namespace std;
// Remove some of the wxUglyness // Remove some of the wxUglyness
typedef wxPanel Panel;
typedef wxWindow Window; typedef wxWindow Window;
typedef wxFrame Frame;
typedef wxBitmap Bitmap; typedef wxBitmap Bitmap;
typedef wxImage Image; typedef wxImage Image;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment