From 771be77f9a134e71facb6611bd490d45cf30b142 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 19 Oct 2004 23:17:30 +0000
Subject: [PATCH] fixed status bar source file name; removed
 wxUSE_NATIVE_STATUS_BAR; removed generic status bar file from makefile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/palmos/makefile                       |  7 +++----
 include/wx/statusbr.h                       |  4 ++--
 src/palmos/{statusbr.cpp => statbrpalm.cpp} | 22 ++++++++++-----------
 3 files changed, 15 insertions(+), 18 deletions(-)
 rename src/palmos/{statusbr.cpp => statbrpalm.cpp} (95%)

diff --git a/build/palmos/makefile b/build/palmos/makefile
index 4af137dc84..8461041858 100644
--- a/build/palmos/makefile
+++ b/build/palmos/makefile
@@ -181,7 +181,6 @@ SOURCES =  ../../samples/minimal/minimal.cpp \
 ../../src/common/zipstrm.cpp \
 ../../src/common/zstream.cpp \
 ../../src/generic/renderg.cpp \
-../../src/generic/statusbr.cpp \
 ../../src/palmos/accel.cpp \
 ../../src/palmos/app.cpp \
 ../../src/palmos/base.cpp \
@@ -266,7 +265,7 @@ SOURCES =  ../../samples/minimal/minimal.cpp \
 ../../src/palmos/spinctrl.cpp \
 ../../src/palmos/statbmp.cpp \
 ../../src/palmos/statbox.cpp \
-../../src/palmos/statusbar.cpp \
+../../src/palmos/statbrpalm.cpp \
 ../../src/palmos/statline.cpp \
 ../../src/palmos/stattext.cpp \
 ../../src/palmos/taskbar.cpp \
@@ -368,8 +367,8 @@ ADDITIONAL_SIM_LINK_LIBRARIES =
 # Additionally, you must explicly specify the "-I" prior to each
 # path included in this variable.  Spaces are used to separate
 # each path from each other.
-LOCAL_INCLUDE_PATHS = -Irsc -I../../include
-LOCAL_SIM_INCLUDE_PATHS = -Irsc -I../../include
+LOCAL_INCLUDE_PATHS = -Irsc -I../../lib/gcc_lib/palmos -I../../include
+LOCAL_SIM_INCLUDE_PATHS = $(LOCAL_INCLUDE_PATHS)
 
 # Additional paths to look for #include <header>
 # (Palm OS SDK directories are automatically included)
diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index ea67d427bc..d60562e139 100644
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -150,10 +150,10 @@ protected:
     #define wxStatusBarUniv wxStatusBar
 
     #include "wx/univ/statusbr.h"
-#elif defined(__PALMOS__) && wxUSE_NATIVE_STATUSBAR
+#elif defined(__PALMOS__)
     #define wxStatusBarPalm wxStatusBar
 
-    #include "wx/palmos/statbrpalm.h"
+    #include "wx/palmos/statusbr.h"
 #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
     #define wxStatusBar95 wxStatusBar
 
diff --git a/src/palmos/statusbr.cpp b/src/palmos/statbrpalm.cpp
similarity index 95%
rename from src/palmos/statusbr.cpp
rename to src/palmos/statbrpalm.cpp
index a4dd9a1499..ae4b758f3a 100644
--- a/src/palmos/statusbr.cpp
+++ b/src/palmos/statbrpalm.cpp
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        palmos/statusbr.cpp
+// Name:        palmos/statbrpalm.cpp
 // Purpose:     Implementation of wxStatusBar for PalmOS
 // Author:      William Osborne
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id:
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -27,7 +27,7 @@
   #include "wx/dcclient.h"
 #endif
 
-#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
+#if wxUSE_STATUSBAR
 
 #include "wx/intl.h"
 #include "wx/log.h"
@@ -126,17 +126,17 @@ void wxStatusBarPalm::DrawStatusBar()
     int leftPos=0;
     wxArrayInt widthsAbs;
     wxString text;
-    
+
     RectangleType EraseRect;
     EraseRect.topLeft.x=0;
-    EraseRect.topLeft.y=160-FntCharHeight()-1;    
+    EraseRect.topLeft.y=160-FntCharHeight()-1;
     EraseRect.extent.x=159;
-    EraseRect.extent.y=159;    
+    EraseRect.extent.y=159;
     WinEraseRectangle(&EraseRect,0);
 
     if(m_nFields>0)
         widthsAbs=CalculateAbsWidths(160 - 2*(m_nFields - 1));
-    
+
     for(i=0;i<m_nFields;i++)
     {
         text=GetStatusBufferText(i);
@@ -186,7 +186,7 @@ wxListString *wxStatusBarPalm::GetOrCreateStatusBuffer(int i)
         delete top->GetData();
         st->Erase(top);
         delete st;
-          
+
         StatusTextBuffer[i] = new wxListString();
     }
 
@@ -202,14 +202,12 @@ wxListString *wxStatusBarPalm::GetStatusBufferStack(int i) const
 
 void wxStatusBarPalm::DeleteStatusBuffer()
 {
-    int i=0;
-    
     if(!StatusTextBuffer)
     {
         return;
     }
 
-    for(i=0;i<m_nFields;i++)
+    for(int i=0;i<m_nFields;i++)
     {
         if(StatusTextBuffer[i])
         {
@@ -246,5 +244,5 @@ void wxStatusBarPalm::DoMoveWindow(int x, int y, int width, int height)
 {
 }
 
-#endif // wxUSE_NATIVE_STATUSBAR
+#endif // wxUSE_STATUSBAR
 
-- 
2.50.0