Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
magicseteditor
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
magicseteditor
Commits
b7784d43
Commit
b7784d43
authored
Mar 22, 2011
by
twanvl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed some useless "typedef wxX X"
parent
97239554
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
7 additions
and
9 deletions
+7
-9
src/gui/set/cards_panel.cpp
src/gui/set/cards_panel.cpp
+1
-1
src/gui/set/cards_panel.hpp
src/gui/set/cards_panel.hpp
+1
-1
src/gui/set/console_panel.cpp
src/gui/set/console_panel.cpp
+1
-1
src/gui/set/keywords_panel.cpp
src/gui/set/keywords_panel.cpp
+1
-1
src/gui/symbol/window.hpp
src/gui/symbol/window.hpp
+1
-1
src/gui/welcome_window.cpp
src/gui/welcome_window.cpp
+1
-1
src/gui/welcome_window.hpp
src/gui/welcome_window.hpp
+1
-1
src/util/prec.hpp
src/util/prec.hpp
+0
-2
No files found.
src/gui/set/cards_panel.cpp
View file @
b7784d43
...
...
@@ -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
wx
Panel
(
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
View file @
b7784d43
...
...
@@ -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
View file @
b7784d43
...
...
@@ -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
wx
Panel
(
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
View file @
b7784d43
...
...
@@ -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
wx
Panel
(
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
View file @
b7784d43
...
...
@@ -20,7 +20,7 @@ DECLARE_POINTER_TYPE(ValueActionPerformer);
// ----------------------------------------------------------------------------- : SymbolWindow
/// The window for editing symbols
class
SymbolWindow
:
public
Frame
{
class
SymbolWindow
:
public
wx
Frame
{
public:
/// Construct a SymbolWindow
SymbolWindow
(
Window
*
parent
);
...
...
src/gui/welcome_window.cpp
View file @
b7784d43
...
...
@@ -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
)
:
wx
Frame
(
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
View file @
b7784d43
...
...
@@ -24,7 +24,7 @@ DECLARE_POINTER_TYPE(Set);
* in the future also:
* - new game, new style?
*/
class
WelcomeWindow
:
public
Frame
{
class
WelcomeWindow
:
public
wx
Frame
{
public:
WelcomeWindow
();
...
...
src/util/prec.hpp
View file @
b7784d43
...
...
@@ -43,9 +43,7 @@ using namespace std;
// Remove some of the wxUglyness
typedef
wxPanel
Panel
;
typedef
wxWindow
Window
;
typedef
wxFrame
Frame
;
typedef
wxBitmap
Bitmap
;
typedef
wxImage
Image
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment