compilation fix for Borland C++

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index d6a6909b0f90e89a27c7dc1d496c6b70e25d6f7a..4cdae345f7c762c73ff798b591ba1f8819d15a0c 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -1,92 +1,107 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statusbr.h
-// Purpose:     wxStatusBar class
+// Name:        wx/generic/statusbr.h
+// Purpose:     wxStatusBarGeneric class

 // Author:      Julian Smart
 // Author:      Julian Smart

-// Modified by:
+// Modified by: VZ at 05.02.00 to derive from wxStatusBarBase

 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __STATUSBRH_G__
-#define __STATUSBRH_G__
+#ifndef _WX_GENERIC_STATUSBR_H_
+#define _WX_GENERIC_STATUSBR_H_

 
 

-#ifdef __GNUG__
-#pragma interface "statusbr.h"
-#endif
+#include "wx/defs.h"

 
 

-#include "wx/window.h"
+#if wxUSE_STATUSBAR

 
 

-WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
+#include "wx/pen.h"
+#include "wx/arrstr.h"

 
 

-class WXDLLEXPORT wxStatusBar: public wxWindow
+class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxStatusBar)
-

 public:
 public:

-  wxStatusBar(void);
-  inline wxStatusBar(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxPanelNameStr)
-  {
-      Create(parent, id, pos, size, style, name);
-  }
+    wxStatusBarGeneric() { Init(); }
+    wxStatusBarGeneric(wxWindow *parent,
+                       wxWindowID winid = wxID_ANY,
+                       long style = wxST_SIZEGRIP,
+                       const wxString& name = wxStatusBarNameStr)
+    {
+        Init();
+
+        Create(parent, winid, style, name);
+    }
+
+    virtual ~wxStatusBarGeneric();
+
+    bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
+                long style = wxST_SIZEGRIP,
+                const wxString& name = wxStatusBarNameStr);
+
+    // Create status line
+    virtual void SetFieldsCount(int number = 1,
+                                const int *widths = (const int *) NULL);

 
 

-  ~wxStatusBar();
+    // Set status line text
+    virtual void SetStatusText(const wxString& text, int number = 0);
+    virtual wxString GetStatusText(int number = 0) const;

 
 

-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxPanelNameStr);
+    // Set status line widths
+    virtual void SetStatusWidths(int n, const int widths_field[]);

 
 

-  // Create status line
-  virtual void SetFieldsCount(int number=1, const int widths[] = (const int *) NULL);
-  inline int GetFieldsCount() const { return m_nFields; }
+    // Get the position and size of the field's internal bounding rectangle
+    virtual bool GetFieldRect(int i, wxRect& rect) const;

 
 

-  // Set status line text
-  virtual void SetStatusText(const wxString& text, int number = 0);
-  virtual wxString GetStatusText(int number = 0) const;
+    // sets the minimal vertical size of the status bar
+    virtual void SetMinHeight(int height);

 
 

-  // Set status line widths
-  virtual void SetStatusWidths(int n, const int widths_field[]);
+    virtual int GetBorderX() const { return m_borderX; }
+    virtual int GetBorderY() const { return m_borderY; }

 
 

-  virtual void DrawFieldText(wxDC& dc, int i);
-  virtual void DrawField(wxDC& dc, int i);
+    ////////////////////////////////////////////////////////////////////////
+    // Implementation

 
 

-  // Get the position and size of the field's internal bounding rectangle
-  virtual bool GetFieldRect(int i, wxRectangle& rect) const;
+    virtual void DrawFieldText(wxDC& dc, int i);
+    virtual void DrawField(wxDC& dc, int i);

 
 

-  inline int GetBorderX() const { return m_borderX; }
-  inline int GetBorderY() const { return m_borderY; }
-  inline void SetBorderX(int x);
-  inline void SetBorderY(int y);
+    void SetBorderX(int x);
+    void SetBorderY(int y);

 
 

-  ////////////////////////////////////////////////////////////////////////
-  // Implementation
+    void OnPaint(wxPaintEvent& event);

 
 

-  void OnPaint(wxPaintEvent& event);
+    void OnLeftDown(wxMouseEvent& event);
+    void OnRightDown(wxMouseEvent& event);

 
 

-  virtual void InitColours();
+    virtual void InitColours();

 
 

-  // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
+    // Responds to colour changes
+    void OnSysColourChanged(wxSysColourChangedEvent& event);

 
 protected:
 
 protected:

-  int *             m_statusWidths;
-  int               m_nFields;
-  wxString *        m_statusStrings;
-  int               m_borderX;
-  int               m_borderY;
-  wxFont            m_defaultStatusBarFont;
-  wxPen             m_mediumShadowPen;
-  wxPen             m_hilightPen;
-
-  DECLARE_EVENT_TABLE()
+    // common part of all ctors
+    void Init();
+
+    wxArrayString     m_statusStrings;
+
+    // the last known width of the client rect (used to rebuild cache)
+    int               m_lastClientWidth;
+    // the widths of the status bar panes in pixels
+    wxArrayInt        m_widthsAbs;
+
+    int               m_borderX;
+    int               m_borderY;
+    wxPen             m_mediumShadowPen;
+    wxPen             m_hilightPen;
+
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)

 };
 
 };
 

+#endif // wxUSE_STATUSBAR
+

 #endif
 #endif

-    // __STATUSBRH_G__
+    // _WX_GENERIC_STATUSBR_H_