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

rtti api mods added

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-08-18 09:57:02 +00:00
parent 404f1d80d8
commit 1978421a6d
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/ctrlsub.h
View File

@@ -44,6 +44,10 @@ public:
int Append(const wxString& item, wxClientData *clientData) int Append(const wxString& item, wxClientData *clientData)
{ int n = DoAppend(item); SetClientObject(n, clientData); return n; } { int n = DoAppend(item); SetClientObject(n, clientData); return n; }
// only for rtti needs (separate name)
void AppendString( const wxString& item)
{ Append( item ) ; }
// append several items at once to the control // append several items at once to the control
void Append(const wxArrayString& strings); void Append(const wxArrayString& strings);
@@ -65,6 +69,7 @@ public:
bool IsEmpty() const { return GetCount() == 0; } bool IsEmpty() const { return GetCount() == 0; }
virtual wxString GetString(int n) const = 0; virtual wxString GetString(int n) const = 0;
wxArrayString GetStrings() const;
virtual void SetString(int n, const wxString& s) = 0; virtual void SetString(int n, const wxString& s) = 0;
virtual int FindString(const wxString& s) const = 0; virtual int FindString(const wxString& s) const = 0;

14
include/wx/window.h
View File

@@ -229,6 +229,13 @@ public:
return wxSize(w, h); return wxSize(w, h);
} }
// the following are just helper functions to help some compiler with the extended rtti inf
void SetWindowPosition( const wxPoint &pt) { SetPosition( pt ) ; }
wxPoint GetWindowPosition() const { return GetPosition() ; }
void SetWindowSize( const wxSize &sz ) { SetSize( sz ) ; }
wxSize GetWindowSize() const { return GetSize() ; }
wxRect GetRect() const wxRect GetRect() const
{ {
int x, y, w, h; int x, y, w, h;
@@ -434,6 +441,9 @@ public:
const wxWindowList& GetChildren() const { return m_children; } const wxWindowList& GetChildren() const { return m_children; }
wxWindowList& GetChildren() { return m_children; } wxWindowList& GetChildren() { return m_children; }
// needed just for extended runtime
const wxWindowList& GetWindowChildren() const { return GetChildren() ; }
// get the parent or the parent of the parent // get the parent or the parent of the parent
wxWindow *GetParent() const { return m_parent; } wxWindow *GetParent() const { return m_parent; }
inline wxWindow *GetGrandParent() const; inline wxWindow *GetGrandParent() const;
@@ -636,6 +646,9 @@ public:
const wxFont& GetFont() const { return m_font; } const wxFont& GetFont() const { return m_font; }
wxFont& GetFont() { return m_font; } wxFont& GetFont() { return m_font; }
// for resolving RTTI conflicts
wxFont GetWindowFont() const { return GetFont() ; }
#if wxUSE_CARET #if wxUSE_CARET
// associate a caret with the window // associate a caret with the window
void SetCaret(wxCaret *caret); void SetCaret(wxCaret *caret);
@@ -775,6 +788,7 @@ public:
void SetToolTip( wxToolTip *tip ) { DoSetToolTip(tip); } void SetToolTip( wxToolTip *tip ) { DoSetToolTip(tip); }
// get the associated tooltip or NULL if none // get the associated tooltip or NULL if none
wxToolTip* GetToolTip() const { return m_tooltip; } wxToolTip* GetToolTip() const { return m_tooltip; }
wxString GetToolTipText() const ;
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
// drag and drop // drag and drop