Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xti fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-07-30 18:08:13 +00:00
parent 5c0217af06
commit 30fd71e65b
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/xti.cpp
View File

@@ -210,36 +210,36 @@ wxString wxXmlGetContentFromNode( wxXmlNode *node )
// long // long
void wxStringReadValue(const wxString &s , long &data ) template<> void wxStringReadValue(const wxString &s , long &data )
{ {
wxSscanf(s, _T("%ld"), &data ) ; wxSscanf(s, _T("%ld"), &data ) ;
} }
void wxStringWriteValue(wxString &s , const long &data ) template<> void wxStringWriteValue(wxString &s , const long &data )
{ {
s = wxString::Format("%ld", data ) ; s = wxString::Format("%ld", data ) ;
} }
// long // int
void wxStringReadValue(const wxString &s , int &data ) template<> void wxStringReadValue(const wxString &s , int &data )
{ {
wxSscanf(s, _T("%d"), &data ) ; wxSscanf(s, _T("%d"), &data ) ;
} }
void wxStringWriteValue(wxString &s , const int &data ) template<> void wxStringWriteValue(wxString &s , const int &data )
{ {
s = wxString::Format("%d", data ) ; s = wxString::Format("%d", data ) ;
} }
// wxString // wxString
void wxStringReadValue(const wxString &s , wxString &data ) template<> void wxStringReadValue(const wxString &s , wxString &data )
{ {
data = s ; data = s ;
} }
void wxStringWriteValue(wxString &s , const wxString &data ) template<> void wxStringWriteValue(wxString &s , const wxString &data )
{ {
s = data ; s = data ;
} }
@@ -252,24 +252,24 @@ void wxStringWriteValue(wxString &s , const wxString &data )
// wxPoint // wxPoint
void wxStringReadValue(const wxString &s , wxPoint &data ) template<> void wxStringReadValue(const wxString &s , wxPoint &data )
{ {
wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ; wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ;
} }
void wxStringWriteValue(wxString &s , const wxPoint &data ) template<> void wxStringWriteValue(wxString &s , const wxPoint &data )
{ {
s = wxString::Format("%d,%d", data.x , data.y ) ; s = wxString::Format("%d,%d", data.x , data.y ) ;
} }
WX_CUSTOM_TYPE_INFO(wxPoint) WX_CUSTOM_TYPE_INFO(wxPoint)
void wxStringReadValue(const wxString &s , wxSize &data ) template<> void wxStringReadValue(const wxString &s , wxSize &data )
{ {
wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ; wxSscanf(s, _T("%d,%d"), &data.x , &data.y ) ;
} }
void wxStringWriteValue(wxString &s , const wxSize &data ) template<> void wxStringWriteValue(wxString &s , const wxSize &data )
{ {
s = wxString::Format("%d,%d", data.x , data.y ) ; s = wxString::Format("%d,%d", data.x , data.y ) ;
} }

10
src/msw/window.cpp
View File

@@ -233,12 +233,12 @@ static inline void wxBringWindowToTop(HWND hwnd)
IMPLEMENT_DYNAMIC_CLASS_XTI(wxWindow, wxWindowBase,"wx/window.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxWindow, wxWindowBase,"wx/window.h")
WX_BEGIN_PROPERTIES_TABLE(wxWindow) WX_BEGIN_PROPERTIES_TABLE(wxWindow)
WX_PROPERTY( Parent,wxWindow*, NULL, GetParent, ) WX_READONLY_PROPERTY( Parent,wxWindow*, GetParent, )
WX_PROPERTY( Id,wxWindowID, SetId, GetId, -1 ) WX_PROPERTY( Id,wxWindowID, SetId, GetId, -1 )
WX_PROPERTY( Title,wxString, SetTitle, GetTitle, wxT("") ) WX_PROPERTY_SET_BY_REF( Title,wxString, SetTitle, GetTitle, wxT("") )
WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxT("") ) WX_PROPERTY_SET_BY_REF( Label,wxString, SetLabel, GetLabel, wxT("") )
WX_PROPERTY( Position,wxPoint, NULL , GetPosition, wxDefaultPosition ) WX_PROPERTY_SET_BY_REF( Position,wxPoint, SetPosition , GetPosition, wxDefaultPosition )
WX_PROPERTY( Size,wxSize, SetSize, GetSize, wxDefaultSize ) WX_PROPERTY_SET_BY_REF( Size,wxSize, SetSize, GetSize, wxDefaultSize )
WX_END_PROPERTIES_TABLE() WX_END_PROPERTIES_TABLE()
WX_BEGIN_HANDLERS_TABLE(wxWindow) WX_BEGIN_HANDLERS_TABLE(wxWindow)