make OSX defines to be 1, not only defined, for backwards compatibility reasons

[wxWidgets.git] / include / wx / palmos / statusbr.h

diff --git a/include/wx/palmos/statusbr.h b/include/wx/palmos/statusbr.h
index 485e9a1b7b432edfee32bc62b09dc86345c75c34..977723ce854c0b67aab747261eb80a23d3e65fb9 100644 (file)
--- a/include/wx/palmos/statusbr.h
+++ b/include/wx/palmos/statusbr.h
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        palmos/statusbr.h
+// Name:        wx/palmos/statusbr.h

 // Purpose:     Palm OS implementation of wxStatusBar
 // Purpose:     Palm OS implementation of wxStatusBar

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -12,32 +12,32 @@
 #ifndef   _WX_STATUSBR_H_
 #define   _WX_STATUSBR_H_
 
 #ifndef   _WX_STATUSBR_H_
 #define   _WX_STATUSBR_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "statusbr.h"
-#endif
-

 #if wxUSE_NATIVE_STATUSBAR
 
 #if wxUSE_NATIVE_STATUSBAR
 

-class WXDLLEXPORT wxStatusBarPalm : public wxStatusBarBase
+class WXDLLIMPEXP_CORE wxStatusBarPalm : public wxStatusBarBase

 {
 public:
     // ctors and such
     wxStatusBarPalm();
     wxStatusBarPalm(wxWindow *parent,
 {
 public:
     // ctors and such
     wxStatusBarPalm();
     wxStatusBarPalm(wxWindow *parent,

-                  wxWindowID id = -1,
-                  long style = wxST_SIZEGRIP,
-                  const wxString& name = wxEmptyString)
+                    wxWindowID id = wxID_ANY,
+                    long style = wxST_SIZEGRIP,
+                    const wxString& name = wxEmptyString)

     {
         (void)Create(parent, id, style, name);
     }
 
     bool Create(wxWindow *parent,
     {
         (void)Create(parent, id, style, name);
     }
 
     bool Create(wxWindow *parent,

-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,

                 long style = wxST_SIZEGRIP,
                 const wxString& name = wxEmptyString);
 
     virtual ~wxStatusBarPalm();
 
                 long style = wxST_SIZEGRIP,
                 const wxString& name = wxEmptyString);
 
     virtual ~wxStatusBarPalm();
 

+    // for native status bar use native check for visibility
+    virtual bool IsShown() const;
+    virtual bool Show( bool show = true );
+

     // a status line can have several (<256) fields numbered from 0
     virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
 
     // a status line can have several (<256) fields numbered from 0
     virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
 


@@ -57,20 +57,23 @@ public:
     // get the border size
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
     // get the border size
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;

-    
+

     void DrawStatusBar();
 
 protected:
     void CopyFieldsWidth(const int widths[]);
     void SetFieldsWidth();
     void DrawStatusBar();
 
 protected:
     void CopyFieldsWidth(const int widths[]);
     void SetFieldsWidth();

-
+/*

     // store the text in the status bar
     wxListString **StatusTextBuffer;
     void SetStatusBufferText(const wxString& text, int number);
     wxString GetStatusBufferText(int number);
     wxListString *GetOrCreateStatusBuffer(int i);
     wxListString *GetStatusBufferStack(int i) const;
     // store the text in the status bar
     wxListString **StatusTextBuffer;
     void SetStatusBufferText(const wxString& text, int number);
     wxString GetStatusBufferText(int number);
     wxListString *GetOrCreateStatusBuffer(int i);
     wxListString *GetStatusBufferStack(int i) const;

-    void DeleteStatusBuffer();    
+    void DeleteStatusBuffer();
+
+    TODO: reuse wxStatusBarBase's stack routines instead of reimplementing them here
+*/

 
     // override base class virtual
     void DoMoveWindow(int x, int y, int width, int height);
 
     // override base class virtual
     void DoMoveWindow(int x, int y, int width, int height);