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

46
src/common/xti.cpp
View File

@@ -2,7 +2,7 @@
// Name: src/common/xti.cpp // Name: src/common/xti.cpp
// Purpose: runtime metadata information (extended class info // Purpose: runtime metadata information (extended class info
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
// Created: 27/07/03 // Created: 27/07/03
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 1997 Julian Smart // Copyright: (c) 1997 Julian Smart
@@ -37,9 +37,9 @@
// Enum Support // Enum Support
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxEnumData::wxEnumData( wxEnumMemberData* data ) wxEnumData::wxEnumData( wxEnumMemberData* data )
{ {
m_members = data ; m_members = data ;
for ( m_count = 0; m_members[m_count].m_name ; m_count++) for ( m_count = 0; m_members[m_count].m_name ; m_count++)
{} ; {} ;
} }
@@ -82,13 +82,13 @@ const wxChar *wxEnumData::GetEnumMemberName(int value)
return wxT("") ; return wxT("") ;
} }
int wxEnumData::GetEnumMemberValueByIndex( int idx ) int wxEnumData::GetEnumMemberValueByIndex( int idx )
{ {
// we should cache the count in order to avoid out-of-bounds errors // we should cache the count in order to avoid out-of-bounds errors
return m_members[idx].m_value ; return m_members[idx].m_value ;
} }
const char * wxEnumData::GetEnumMemberNameByIndex( int idx ) const char * wxEnumData::GetEnumMemberNameByIndex( int idx )
{ {
// we should cache the count in order to avoid out-of-bounds errors // we should cache the count in order to avoid out-of-bounds errors
return m_members[idx].m_name ; return m_members[idx].m_name ;
@@ -186,17 +186,17 @@ void wxStringWriteValue(wxString & , char const * const & )
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// value streaming // value streaming
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// convenience function (avoids including xml headers in users code) // convenience function (avoids including xml headers in users code)
void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data ) void wxXmlAddContentToNode( wxXmlNode* node , const wxString& data )
{ {
node->AddChild(new wxXmlNode(wxXML_TEXT_NODE, "value", data ) ); node->AddChild(new wxXmlNode(wxXML_TEXT_NODE, "value", data ) );
} }
wxString wxXmlGetContentFromNode( wxXmlNode *node ) wxString wxXmlGetContentFromNode( wxXmlNode *node )
{ {
if ( node->GetChildren() ) if ( node->GetChildren() )
return node->GetChildren()->GetContent() ; return node->GetChildren()->GetContent() ;
@@ -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 ) ;
} }
@@ -278,7 +278,7 @@ WX_CUSTOM_TYPE_INFO(wxSize)
// removing header dependancy on string tokenizer // removing header dependancy on string tokenizer
void wxSetStringToArray( const wxString &s , wxArrayString &array ) void wxSetStringToArray( const wxString &s , wxArrayString &array )
{ {
wxStringTokenizer tokenizer(s, wxT("| \t\n"), wxTOKEN_STRTOK); wxStringTokenizer tokenizer(s, wxT("| \t\n"), wxTOKEN_STRTOK);
wxString flag; wxString flag;
@@ -290,7 +290,7 @@ void wxSetStringToArray( const wxString &s , wxArrayString &array )
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxClassInfo // wxClassInfo
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -314,7 +314,7 @@ void wxClassInfo::Unregister(const char *WXUNUSED(name))
const wxPropertyAccessor *wxClassInfo::FindAccessor(const char *PropertyName) const wxPropertyAccessor *wxClassInfo::FindAccessor(const char *PropertyName)
{ {
const wxPropertyInfo* info = FindPropertyInfo( PropertyName ) ; const wxPropertyInfo* info = FindPropertyInfo( PropertyName ) ;
if ( info ) if ( info )
return info->GetAccessor() ; return info->GetAccessor() ;

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)