|
From: <ma...@us...> - 2003-11-21 10:50:10
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30106
Modified Files:
wxInterface.cpp Images.cpp
Log Message:
Adds `Contents/Resources/` to resources path for wxMac.
Index: wxInterface.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- wxInterface.cpp 21 Nov 2003 10:26:08 -0000 1.2
+++ wxInterface.cpp 21 Nov 2003 10:50:06 -0000 1.3
@@ -121,6 +121,10 @@
path.RemoveLast();
}
+ #if defined(__WXMAC__) && defined(__MACH__)
+ path.Append(wxT("Contents/Resources/"));
+ #endif
+
CheckAndAddSupportedLangs();
/* Set localization files directories */
Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Images.cpp 21 Nov 2003 10:26:08 -0000 1.13
+++ Images.cpp 21 Nov 2003 10:50:07 -0000 1.14
@@ -51,12 +51,16 @@
apppath.RemoveLast();
}
+ #if defined(__WXMAC__) && defined(__MACH__)
+ path.Append(wxT("Contents/Resources/"));
+ #endif
+
m_config->Read(
wxT("/General/IconSets/CurIconSet"), &path, wxT("Default")
);
path.MakeLower();
path = wxString::Format(
- wxT("%s/images/%s/"), apppath.c_str(), path.c_str()
+ wxT("%simages/%s/"), apppath.c_str(), path.c_str()
);
/*
|