From 0ab48d64054e5ec00f908ae3df2648ba4ce17dfe Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 18 Nov 2005 18:34:15 +0000 Subject: [PATCH] Follow other ports with Title/Label split. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/palmos/toplevel.h | 5 ++++- include/wx/palmos/window.h | 5 +++-- src/palmos/toplevel.cpp | 9 +++++++++ src/palmos/window.cpp | 6 ++---- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/include/wx/palmos/toplevel.h b/include/wx/palmos/toplevel.h index cb2680acfd..08954715af 100644 --- a/include/wx/palmos/toplevel.h +++ b/include/wx/palmos/toplevel.h @@ -46,6 +46,10 @@ public: virtual ~wxTopLevelWindowPalm(); // implement base class pure virtuals + + virtual void SetTitle( const wxString& title); + virtual wxString GetTitle() const; + virtual void Maximize(bool maximize = true); virtual bool IsMaximized() const; virtual void Iconize(bool iconize = true); @@ -122,4 +126,3 @@ protected: }; #endif // _WX_PALMOS_TOPLEVEL_H_ - diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h index 698bf7a181..ff7d21b46d 100644 --- a/include/wx/palmos/window.h +++ b/include/wx/palmos/window.h @@ -53,8 +53,9 @@ public: const wxString& name = wxPanelNameStr); // implement base class pure virtuals - virtual void SetTitle( const wxString& title); - virtual wxString GetTitle() const; + + virtual void SetLabel( const wxString& label); + virtual wxString GetLabel() const; virtual void Raise(); virtual void Lower(); diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp index c0c7ce7bbd..2e0f479cbc 100644 --- a/src/palmos/toplevel.cpp +++ b/src/palmos/toplevel.cpp @@ -224,6 +224,15 @@ bool wxTopLevelWindowPalm::ShowFullScreen(bool show, long style) // wxTopLevelWindowPalm misc // ---------------------------------------------------------------------------- +void wxTopLevelWindowPalm::SetTitle( const wxString& WXUNUSED(title)) +{ +} + +wxString wxTopLevelWindowPalm::GetTitle() const +{ + return wxEmptyString; +} + void wxTopLevelWindowPalm::SetIcon(const wxIcon& icon) { } diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp index 8bc3991c8a..9384915c44 100644 --- a/src/palmos/window.cpp +++ b/src/palmos/window.cpp @@ -317,11 +317,11 @@ void wxWindowPalm::Lower() { } -void wxWindowPalm::SetTitle( const wxString& title) +void wxWindowPalm::SetLabel( const wxString& WXUNUSED(label)) { } -wxString wxWindowPalm::GetTitle() const +wxString wxWindowPalm::GetLabel() const { return wxEmptyString; } @@ -751,5 +751,3 @@ bool wxWindowPalm::UnregisterHotKey(int hotkeyId) } #endif // wxUSE_HOTKEY - - -- 2.50.0