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

Removed DECLARE_TYPEOF2; replaced with double-parenthesized macro calls. (GCC doesn't accept the other way in all cases.. I don't know whether MSW accepts this way.) Fixed a few resource names.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@209 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2007-03-15 23:48:01 +00:00
parent 41a8c123cf
commit 83b6aa36f8
20 changed files with 1184 additions and 8327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/card_list.cpp
+2 -2
View File
@@ -26,8 +26,8 @@
DECLARE_TYPEOF_COLLECTION(CardP);
DECLARE_TYPEOF_COLLECTION(FieldP);
DECLARE_POINTER_TYPE(ChoiceValue);
DECLARE_TYPEOF2(map<int,FieldP>);
DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,StyleP>);
DECLARE_TYPEOF((map<int,FieldP>));
DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,StyleP>));
// ----------------------------------------------------------------------------- : Events
src/gui/control/graph.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ DECLARE_TYPEOF_COLLECTION(GraphAxisP);
DECLARE_TYPEOF_COLLECTION(GraphElementP);
DECLARE_TYPEOF_COLLECTION(GraphGroup);
DECLARE_TYPEOF_COLLECTION(int);
DECLARE_TYPEOF2(map<String,UInt>);
DECLARE_TYPEOF((map<String,UInt>));
// ----------------------------------------------------------------------------- : Events
src/gui/control/native_look_editor.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
#include <data/stylesheet.hpp>
DECLARE_TYPEOF_COLLECTION(ValueViewerP);
DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,StyleP>);
DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,StyleP>));
// ----------------------------------------------------------------------------- : NativeLookEditor
src/gui/welcome_window.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
WelcomeWindow::WelcomeWindow()
: Frame(nullptr, wxID_ANY, _TITLE_("magic set editor"), wxDefaultPosition, wxSize(480,340), wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL | wxCLIP_CHILDREN )
, logo (load_resource_image(_("about")))
, logo2(load_resource_image(_("two")))
, logo2(load_resource_image(_("two_beta")))
{
SetIcon(load_resource_icon(_("app")));
@@ -120,7 +120,7 @@ END_EVENT_TABLE ()
// ----------------------------------------------------------------------------- : Hover button with label
HoverButtonExt::HoverButtonExt(Window* parent, int id, const wxImage& icon, const String& label, const String& sub_label)
: HoverButton(parent, id, _("BTN"))
: HoverButton(parent, id, _("btn"))
, icon(icon)
, label(label), sub_label(sub_label)
, font_large(14, wxSWISS, wxNORMAL, wxNORMAL, false, _("Arial"))