Merge of SOC2010_RTC_IMAGES branch.

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

diff --git a/include/wx/palmos/statusbr.h b/include/wx/palmos/statusbr.h
index ee376f8841979e3837aa6e4e5d2cc4571b5d1fb7..1a866993cd093e82f274340a470d9ffa6fb3ff02 100644 (file)
--- a/include/wx/palmos/statusbr.h
+++ b/include/wx/palmos/statusbr.h
@@ -14,14 +14,14 @@
 
 #if wxUSE_NATIVE_STATUSBAR
 
-class WXDLLEXPORT wxStatusBarPalm : public wxStatusBarBase
+class WXDLLIMPEXP_CORE wxStatusBarPalm : public wxStatusBarBase
 {
 public:
     // ctors and such
     wxStatusBarPalm();
     wxStatusBarPalm(wxWindow *parent,
                     wxWindowID id = wxID_ANY,
-                    long style = wxST_SIZEGRIP,
+                    long style = wxSTB_DEFAULT_STYLE,
                     const wxString& name = wxEmptyString)
     {
         (void)Create(parent, id, style, name);
@@ -29,7 +29,7 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
-                long style = wxST_SIZEGRIP,
+                long style = wxSTB_DEFAULT_STYLE,
                 const wxString& name = wxEmptyString);
 
     virtual ~wxStatusBarPalm();
@@ -41,29 +41,22 @@ public:
     // a status line can have several (<256) fields numbered from 0
     virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
 
-    // each field of status line has it's own text
-    virtual void     SetStatusText(const wxString& text, int number = 0);
-    virtual wxString GetStatusText(int number = 0) const;
-
-    // set status line fields' widths
+    // implement base class methods
     virtual void SetStatusWidths(int n, const int widths_field[]);
-
-    // sets the minimal vertical size of the status bar
     virtual void SetMinHeight(int height);
-
-    // get the position and size of the field's internal bounding rectangle
     virtual bool GetFieldRect(int i, wxRect& rect) const;
 
-    // get the border size
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 
     void DrawStatusBar();
 
 protected:
+    virtual void DoUpdateStatusText(int nField);
+
     void CopyFieldsWidth(const int widths[]);
     void SetFieldsWidth();
-
+/*
     // store the text in the status bar
     wxListString **StatusTextBuffer;
     void SetStatusBufferText(const wxString& text, int number);
@@ -72,6 +65,9 @@ protected:
     wxListString *GetStatusBufferStack(int i) const;
     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);