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

@@ -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)

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
 

src/palmos/statbrpalm.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        palmos/statusbr.cpp
+// Name:        palmos/statbrpalm.cpp
 // Purpose:     Implementation of wxStatusBar for PalmOS
 // Author:      William Osborne
 // Modified by:
@@ -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"
@@ -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