Applied patch [ 1183157 ] Compilation with GCC 4.0

[wxWidgets.git] / src / palmos / statbrpalm.cpp

diff --git a/src/palmos/statbrpalm.cpp b/src/palmos/statbrpalm.cpp
index 0b77b5d42471800fc3d99cfdff84c6bed4d3c20e..f662696fdf5f2481664baf319dd88553fd9c7329 100644 (file)
--- a/src/palmos/statbrpalm.cpp
+++ b/src/palmos/statbrpalm.cpp
@@ -48,8 +48,6 @@
 wxStatusBarPalm::wxStatusBarPalm()
 {
     SetParent(NULL);
 wxStatusBarPalm::wxStatusBarPalm()
 {
     SetParent(NULL);

-    m_hWnd = 0;
-    m_windowId = 0;

 }
 
 bool wxStatusBarPalm::Create(wxWindow *parent,
 }
 
 bool wxStatusBarPalm::Create(wxWindow *parent,


@@ -63,13 +61,11 @@ bool wxStatusBarPalm::Create(wxWindow *parent,
 
     SetName(name);
     SetParent(parent);
 
     SetName(name);
     SetParent(parent);

+    SetId( id == wxID_ANY ? NewControlId() : id );

 
     parent->AddChild(this);
 
 
     parent->AddChild(this);
 

-    m_windowId = id == wxID_ANY ? NewControlId() : id;
-

     SetFieldsCount(1);
     SetFieldsCount(1);

-    SubclassWin(m_hWnd);

 
     return true;
 }
 
     return true;
 }


@@ -150,6 +146,7 @@ wxString wxStatusBarPalm::GetStatusText(int nField) const
 
 void wxStatusBarPalm::DrawStatusBar()
 {
 
 void wxStatusBarPalm::DrawStatusBar()
 {

+#if 0

     int i=0;
     int leftPos=0;
     wxArrayInt widthsAbs;
     int i=0;
     int leftPos=0;
     wxArrayInt widthsAbs;


@@ -172,6 +169,7 @@ void wxStatusBarPalm::DrawStatusBar()
         leftPos+=widthsAbs[i]+2;
     }
     WinDrawLine(0,160-FntCharHeight()-1,159,160-FntCharHeight()-1);
         leftPos+=widthsAbs[i]+2;
     }
     WinDrawLine(0,160-FntCharHeight()-1,159,160-FntCharHeight()-1);

+#endif

 }
 
 void wxStatusBarPalm::SetStatusBufferText(const wxString& text, int number)
 }
 
 void wxStatusBarPalm::SetStatusBufferText(const wxString& text, int number)


@@ -187,7 +185,7 @@ wxString wxStatusBarPalm::GetStatusBufferText(int number)
 {
     wxListString *st = GetStatusBufferStack(number);
     if(st==0)
 {
     wxListString *st = GetStatusBufferStack(number);
     if(st==0)

-        return "";
+        return wxEmptyString;

 
     wxListString::compatibility_iterator top = st->GetFirst();
     return(*top->GetData());
 
     wxListString::compatibility_iterator top = st->GetFirst();
     return(*top->GetData());