compilation fix for compilers not using PCH

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

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 103e8479f74c2e951a85c80c049929d6ef21aa17..d91defc1b3db9b744ea759be7626350f9a25b519 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     05.02.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     05.02.00
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "statbar.h"
 #endif
 
     #pragma interface "statbar.h"
 #endif
 


@@ -21,9 +21,19 @@
 #if wxUSE_STATUSBAR
 
 #include "wx/list.h"
 #if wxUSE_STATUSBAR
 
 #include "wx/list.h"

+#include "wx/dynarray.h"

 
 WX_DECLARE_LIST(wxString, wxListString);
 
 
 WX_DECLARE_LIST(wxString, wxListString);
 

+// ----------------------------------------------------------------------------
+// wxStatusBar constants
+// ----------------------------------------------------------------------------
+
+// style flags for fields
+#define wxSB_NORMAL    0x0000
+#define wxSB_FLAT      0x0001
+#define wxSB_RAISED    0x0002
+

 // ----------------------------------------------------------------------------
 // wxStatusBar: a window near the bottom of the frame used for status info
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStatusBar: a window near the bottom of the frame used for status info
 // ----------------------------------------------------------------------------


@@ -63,6 +73,15 @@ public:
     // -2 grows twice as much as one with width -1 &c)
     virtual void SetStatusWidths(int n, const int widths[]);
 
     // -2 grows twice as much as one with width -1 &c)
     virtual void SetStatusWidths(int n, const int widths[]);
 

+    // field styles
+    // ------------
+
+    // Set the field style. Use either wxSB_NORMAL (default) for a standard 3D
+    // border around a field, wxSB_FLAT for no border around a field, so that it
+    // appears flat or wxSB_POPOUT to make the field appear raised.
+    // Setting field styles only works on wxMSW
+    virtual void SetStatusStyles(int n, const int styles[]);
+

     // geometry
     // --------
 
     // geometry
     // --------
 


@@ -77,7 +96,7 @@ public:
     virtual int GetBorderY() const = 0;
 
     // don't want status bars to accept the focus at all
     virtual int GetBorderY() const = 0;
 
     // don't want status bars to accept the focus at all

-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }

 
 protected:
     // set the widths array to NULL
 
 protected:
     // set the widths array to NULL


@@ -89,6 +108,11 @@ protected:
     // reset the widths
     void ReinitWidths() { FreeWidths(); InitWidths(); }
 
     // reset the widths
     void ReinitWidths() { FreeWidths(); InitWidths(); }
 

+    // same, for field styles
+    void InitStyles();
+    void FreeStyles();
+    void ReinitStyles() { FreeStyles(); InitStyles(); }
+

     // same, for text stacks
     void InitStacks();
     void FreeStacks();
     // same, for text stacks
     void InitStacks();
     void FreeStacks();


@@ -108,9 +132,14 @@ protected:
     // width otherwise
     int       *m_statusWidths;
 
     // width otherwise
     int       *m_statusWidths;
 

+    // the styles of the fields
+    int       *m_statusStyles;
+

     // stacks of previous values for PushStatusText/PopStatusText
     // this is created on demand, use GetStatusStack/GetOrCreateStatusStack
     wxListString **m_statusTextStacks;
     // stacks of previous values for PushStatusText/PopStatusText
     // this is created on demand, use GetStatusStack/GetOrCreateStatusStack
     wxListString **m_statusTextStacks;

+
+    DECLARE_NO_COPY_CLASS(wxStatusBarBase)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -119,23 +148,19 @@ protected:
 
 #if defined(__WXUNIVERSAL__)
     #define wxStatusBarUniv wxStatusBar
 
 #if defined(__WXUNIVERSAL__)
     #define wxStatusBarUniv wxStatusBar

-    #define sm_classwxStatusBarUniv sm_classwxStatusBar

 
     #include "wx/univ/statusbr.h"
 #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
     #define wxStatusBar95 wxStatusBar
 
     #include "wx/univ/statusbr.h"
 #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
     #define wxStatusBar95 wxStatusBar

-    #define sm_classwxStatusBar95 sm_classwxStatusBar

 
     #include "wx/msw/statbr95.h"
 #elif defined(__WXMAC__)
     #define wxStatusBarMac wxStatusBar
 
     #include "wx/msw/statbr95.h"
 #elif defined(__WXMAC__)
     #define wxStatusBarMac wxStatusBar

-    #define sm_classwxStatusBarMac sm_classwxStatusBar

 
     #include "wx/generic/statusbr.h"
     #include "wx/mac/statusbr.h"
 #else
     #define wxStatusBarGeneric wxStatusBar
 
     #include "wx/generic/statusbr.h"
     #include "wx/mac/statusbr.h"
 #else
     #define wxStatusBarGeneric wxStatusBar

-    #define sm_classwxStatusBarGeneric sm_classwxStatusBar

 
     #include "wx/generic/statusbr.h"
 #endif
 
     #include "wx/generic/statusbr.h"
 #endif