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

copying cards with a different stylesheet now works

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@344 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-05-12 15:37:11 +00:00
parent 0ffc387983
commit 0007ae67a6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/format/clipboard.cpp
+8 -5
View File
@@ -38,7 +38,7 @@ void deserialize_from_clipboard(T& object, Package& package, const String& data)
/// A wrapped card for storing on the clipboard /// A wrapped card for storing on the clipboard
struct WrappedCard { struct WrappedCard {
String expected_game_name; Game* expected_game;
String game_name; String game_name;
CardP card; CardP card;
@@ -46,15 +46,18 @@ struct WrappedCard {
}; };
IMPLEMENT_REFLECTION(WrappedCard) { IMPLEMENT_REFLECTION(WrappedCard) {
if (game_name == expected_game_name) REFLECT(game_name); REFLECT(game_name);
if (game_name == expected_game_name) REFLECT(card); if (game_name == expected_game->name()) {
WITH_DYNAMIC_ARG(game_for_reading, expected_game);
REFLECT(card);
}
} }
wxDataFormat CardDataObject::format = _("application/x-mse-card"); wxDataFormat CardDataObject::format = _("application/x-mse-card");
CardDataObject::CardDataObject(const SetP& set, const CardP& card) { CardDataObject::CardDataObject(const SetP& set, const CardP& card) {
WrappedCard data = { set->game->name(), set->game->name(), card }; WrappedCard data = { set->game.get(), set->game->name(), card };
SetText(serialize_for_clipboard(*set, data)); SetText(serialize_for_clipboard(*set, data));
SetFormat(format); SetFormat(format);
} }
@@ -65,7 +68,7 @@ CardDataObject::CardDataObject() {
CardP CardDataObject::getCard(const SetP& set) { CardP CardDataObject::getCard(const SetP& set) {
CardP card(new Card(*set->game)); CardP card(new Card(*set->game));
WrappedCard data = { set->game->name(), set->game->name(), card}; WrappedCard data = { set->game.get(), set->game->name(), card};
deserialize_from_clipboard(data, *set, GetText()); deserialize_from_clipboard(data, *set, GetText());
if (data.game_name != set->game->name()) return CardP(); // Card is from a different game if (data.game_name != set->game->name()) return CardP(); // Card is from a different game
else return card; else return card;