Revision: 1747
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1747&view=rev
Author: rorthomas
Date: 2011-03-11 10:36:08 +0000 (Fri, 11 Mar 2011)
Log Message:
-----------
fixed code to work together with new mygui version
Modified Paths:
--------------
trunk/source/main/framework/ContentManager.cpp
trunk/source/main/gui/SelectorWindow.h
Modified: trunk/source/main/framework/ContentManager.cpp
===================================================================
--- trunk/source/main/framework/ContentManager.cpp 2011-03-11 09:42:36 UTC
(rev 1746)
+++ trunk/source/main/framework/ContentManager.cpp 2011-03-11 10:36:08 UTC
(rev 1747)
@@ -103,7 +103,7 @@
loadMainResource("meshes");
loadMainResource("overlays");
loadMainResource("particles");
- loadMainResource("mygui", "cache"); // HACK for mygui only supporting
one resource group
+ loadMainResource("mygui");
loadMainResource("scripts");
loadMainResource("textures");
loadMainResource("flags");
Modified: trunk/source/main/gui/SelectorWindow.h
===================================================================
--- trunk/source/main/gui/SelectorWindow.h 2011-03-11 09:42:36 UTC (rev
1746)
+++ trunk/source/main/gui/SelectorWindow.h 2011-03-11 10:36:08 UTC (rev
1747)
@@ -31,6 +31,7 @@
class Cache_Entry;
ATTRIBUTE_CLASS_LAYOUT(SelectorWindow, "SelectorWindow.layout");
+
class SelectorWindow :
public wraps::BaseLayout,
public Singleton2<SelectorWindow>
@@ -83,8 +84,6 @@
int visibleCounter;
Skin *mSelectedSkin;
private:
- ATTRIBUTE_FIELD_WIDGET_NAME(SelectorWindow, mCacheSheet, "Cache");
- MyGUI::Sheet* mCacheSheet;
ATTRIBUTE_FIELD_WIDGET_NAME(SelectorWindow, mTypeComboBox, "Type");
MyGUI::ComboBox* mTypeComboBox;
ATTRIBUTE_FIELD_WIDGET_NAME(SelectorWindow, mModelList, "Model");
@@ -101,8 +100,6 @@
MyGUI::Button* mOkButton;
ATTRIBUTE_FIELD_WIDGET_NAME(SelectorWindow, mCancelButton, "Cancel");
MyGUI::Button* mCancelButton;
- ATTRIBUTE_FIELD_WIDGET_NAME(SelectorWindow, mSearchSheet, "Search");
- MyGUI::Sheet* mSearchSheet;
ATTRIBUTE_FIELD_WIDGET_NAME(SelectorWindow, mSearchLineEdit,
"SearchLine");
MyGUI::EditBox* mSearchLineEdit;
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Rigsofrods-devel mailing list
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
