added wxSYS_ICONTITLE_FONT (patch 816026)

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index f908a144268eab7ce77e29b7b16f1aa0394ea4d6..c36a0c7cdcc3c30a8b3592b6c243566cfa0d6ce6 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -12,13 +12,14 @@
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 

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

 #pragma interface "statusbr.h"
 #endif
 
 #include "wx/pen.h"
 #include "wx/font.h"
 #include "wx/statusbr.h"
 #pragma interface "statusbr.h"
 #endif
 
 #include "wx/pen.h"
 #include "wx/font.h"
 #include "wx/statusbr.h"

+#include "wx/arrstr.h"

 
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 


@@ -27,7 +28,7 @@ class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 public:
   wxStatusBarGeneric() { Init(); }
   wxStatusBarGeneric(wxWindow *parent,
 public:
   wxStatusBarGeneric() { Init(); }
   wxStatusBarGeneric(wxWindow *parent,

-              wxWindowID id,
+              wxWindowID winid,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,


@@ -35,30 +36,30 @@ public:
   {
       Init();
 
   {
       Init();
 

-      Create(parent, id, pos, size, style, name);
+      Create(parent, winid, pos, size, style, name);

   }
   wxStatusBarGeneric(wxWindow *parent,
   }
   wxStatusBarGeneric(wxWindow *parent,

-                     wxWindowID id,
+                     wxWindowID winid,

                      long style,
                      const wxString& name = wxPanelNameStr)
   {
       Init();
 
                      long style,
                      const wxString& name = wxPanelNameStr)
   {
       Init();
 

-      Create(parent, id, style, name);
+      Create(parent, winid, style, name);

   }
 
   virtual ~wxStatusBarGeneric();
 
   }
 
   virtual ~wxStatusBarGeneric();
 

-  bool Create(wxWindow *parent, wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID winid,

               const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
               const wxSize& WXUNUSED(size) = wxDefaultSize,
               long style = 0,
               const wxString& name = wxPanelNameStr)
   {
               const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
               const wxSize& WXUNUSED(size) = wxDefaultSize,
               long style = 0,
               const wxString& name = wxPanelNameStr)
   {

-      return Create(parent, id, style, name);
+      return Create(parent, winid, style, name);

   }
 
   }
 

-  bool Create(wxWindow *parent, wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID winid,

               long style,
               const wxString& name = wxPanelNameStr);
 
               long style,
               const wxString& name = wxPanelNameStr);
 


@@ -120,10 +121,8 @@ protected:
 
 private:
   DECLARE_EVENT_TABLE()
 
 private:
   DECLARE_EVENT_TABLE()

-  DECLARE_DYNAMIC_CLASS(wxStatusBarGeneric)
+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)

 };
 
 #endif
     // _WX_GENERIC_STATUSBR_H_
 };
 
 #endif
     // _WX_GENERIC_STATUSBR_H_

-
-// vi:sts=4:sw=4:et