Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed status bar source file name; removed wxUSE_NATIVE_STATUS_BAR; removed generic status bar file from makefile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-10-19 23:17:30 +00:00
parent 3eb1416ab2
commit 771be77f9a
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/palmos/makefile
View File

@@ -181,7 +181,6 @@ SOURCES = ../../samples/minimal/minimal.cpp \
../../src/common/zipstrm.cpp \ ../../src/common/zipstrm.cpp \
../../src/common/zstream.cpp \ ../../src/common/zstream.cpp \
../../src/generic/renderg.cpp \ ../../src/generic/renderg.cpp \
../../src/generic/statusbr.cpp \
../../src/palmos/accel.cpp \ ../../src/palmos/accel.cpp \
../../src/palmos/app.cpp \ ../../src/palmos/app.cpp \
../../src/palmos/base.cpp \ ../../src/palmos/base.cpp \
@@ -266,7 +265,7 @@ SOURCES = ../../samples/minimal/minimal.cpp \
../../src/palmos/spinctrl.cpp \ ../../src/palmos/spinctrl.cpp \
../../src/palmos/statbmp.cpp \ ../../src/palmos/statbmp.cpp \
../../src/palmos/statbox.cpp \ ../../src/palmos/statbox.cpp \
../../src/palmos/statusbar.cpp \ ../../src/palmos/statbrpalm.cpp \
../../src/palmos/statline.cpp \ ../../src/palmos/statline.cpp \
../../src/palmos/stattext.cpp \ ../../src/palmos/stattext.cpp \
../../src/palmos/taskbar.cpp \ ../../src/palmos/taskbar.cpp \
@@ -368,8 +367,8 @@ ADDITIONAL_SIM_LINK_LIBRARIES =
# Additionally, you must explicly specify the "-I" prior to each # Additionally, you must explicly specify the "-I" prior to each
# path included in this variable. Spaces are used to separate # path included in this variable. Spaces are used to separate
# each path from each other. # each path from each other.
LOCAL_INCLUDE_PATHS = -Irsc -I../../include LOCAL_INCLUDE_PATHS = -Irsc -I../../lib/gcc_lib/palmos -I../../include
LOCAL_SIM_INCLUDE_PATHS = -Irsc -I../../include LOCAL_SIM_INCLUDE_PATHS = $(LOCAL_INCLUDE_PATHS)
# Additional paths to look for #include <header> # Additional paths to look for #include <header>
# (Palm OS SDK directories are automatically included) # (Palm OS SDK directories are automatically included)

4
include/wx/statusbr.h
View File

@@ -150,10 +150,10 @@ protected:
#define wxStatusBarUniv wxStatusBar #define wxStatusBarUniv wxStatusBar
#include "wx/univ/statusbr.h" #include "wx/univ/statusbr.h"
#elif defined(__PALMOS__) && wxUSE_NATIVE_STATUSBAR #elif defined(__PALMOS__)
#define wxStatusBarPalm wxStatusBar #define wxStatusBarPalm wxStatusBar
#include "wx/palmos/statbrpalm.h" #include "wx/palmos/statusbr.h"
#elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
#define wxStatusBar95 wxStatusBar #define wxStatusBar95 wxStatusBar

10
src/palmos/statusbr.cpp → src/palmos/statbrpalm.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: palmos/statusbr.cpp // Name: palmos/statbrpalm.cpp
// Purpose: Implementation of wxStatusBar for PalmOS // Purpose: Implementation of wxStatusBar for PalmOS
// Author: William Osborne // Author: William Osborne
// Modified by: // Modified by:
@@ -27,7 +27,7 @@
#include "wx/dcclient.h" #include "wx/dcclient.h"
#endif #endif
#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR #if wxUSE_STATUSBAR
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
@@ -202,14 +202,12 @@ wxListString *wxStatusBarPalm::GetStatusBufferStack(int i) const
void wxStatusBarPalm::DeleteStatusBuffer() void wxStatusBarPalm::DeleteStatusBuffer()
{ {
int i=0;
if(!StatusTextBuffer) if(!StatusTextBuffer)
{ {
return; return;
} }
for(i=0;i<m_nFields;i++) for(int i=0;i<m_nFields;i++)
{ {
if(StatusTextBuffer[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