Follow other ports with Title/Label split.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/palmos/toplevel.h b/include/wx/palmos/toplevel.h
index cb2680acfde197d1c2412a6c9d32effc2ba49d80..08954715afd4489916335e24b25bc76de519c22d 100644 (file)
--- 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 ~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);
     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_
 };
 
 #endif // _WX_PALMOS_TOPLEVEL_H_

-

diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h
index 698bf7a181ad914be99082776e869f9c6cc4510e..ff7d21b46d9ec18f75dcb269d715473a632b3a39 100644 (file)
--- 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
                 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();
 
     virtual void Raise();
     virtual void Lower();

diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index c0c7ce7bbd154846c531d8d5ceb072b1dc3e5cb0..2e0f479cbcaad2c2bad0d7e23208114e0008ceb5 100644 (file)
--- a/src/palmos/toplevel.cpp
+++ b/src/palmos/toplevel.cpp
@@ -224,6 +224,15 @@ bool wxTopLevelWindowPalm::ShowFullScreen(bool show, long style)
 // wxTopLevelWindowPalm misc
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowPalm misc
 // ----------------------------------------------------------------------------
 

+void wxTopLevelWindowPalm::SetTitle( const wxString& WXUNUSED(title))
+{
+}
+
+wxString wxTopLevelWindowPalm::GetTitle() const
+{
+    return wxEmptyString;
+}
+

 void wxTopLevelWindowPalm::SetIcon(const wxIcon& icon)
 {
 }
 void wxTopLevelWindowPalm::SetIcon(const wxIcon& icon)
 {
 }

diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp
index 8bc3991c8af88da1fee15946508e1c317b02b38e..9384915c440ae9ab5ef22426767d96fafa8cecee 100644 (file)
--- 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;
 }
 {
     return wxEmptyString;
 }


@@ -751,5 +751,3 @@ bool wxWindowPalm::UnregisterHotKey(int hotkeyId)
 }
 
 #endif // wxUSE_HOTKEY
 }
 
 #endif // wxUSE_HOTKEY

-
-