From 1978421a6d8b81c1f8a961da4b8ddf544fec7b1b Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 18 Aug 2003 09:57:02 +0000 Subject: [PATCH] rtti api mods added git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/ctrlsub.h | 5 +++++ include/wx/window.h | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index 6cbf031746..fbe39dc4b9 100644 --- a/include/wx/ctrlsub.h +++ b/include/wx/ctrlsub.h @@ -44,6 +44,10 @@ public: int Append(const wxString& item, wxClientData *clientData) { 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 void Append(const wxArrayString& strings); @@ -65,6 +69,7 @@ public: bool IsEmpty() const { return GetCount() == 0; } virtual wxString GetString(int n) const = 0; + wxArrayString GetStrings() const; virtual void SetString(int n, const wxString& s) = 0; virtual int FindString(const wxString& s) const = 0; diff --git a/include/wx/window.h b/include/wx/window.h index 3de333b04e..2c266712cc 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -229,6 +229,13 @@ public: 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 { int x, y, w, h; @@ -434,6 +441,9 @@ public: const wxWindowList& GetChildren() const { 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 wxWindow *GetParent() const { return m_parent; } inline wxWindow *GetGrandParent() const; @@ -636,6 +646,9 @@ public: const wxFont& GetFont() const { return m_font; } wxFont& GetFont() { return m_font; } + // for resolving RTTI conflicts + wxFont GetWindowFont() const { return GetFont() ; } + #if wxUSE_CARET // associate a caret with the window void SetCaret(wxCaret *caret); @@ -775,6 +788,7 @@ public: void SetToolTip( wxToolTip *tip ) { DoSetToolTip(tip); } // get the associated tooltip or NULL if none wxToolTip* GetToolTip() const { return m_tooltip; } + wxString GetToolTipText() const ; #endif // wxUSE_TOOLTIPS // drag and drop -- 2.47.2