added wxConvFileName which is a variable, not define as wxConvFile; added comments...

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index fe00d93e307d4f9d31184088f025d6296ccb8263..08e2e6ae6398b219e0b04df0bcd46ae51ab785bd 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -5,60 +5,61 @@
 // Modified by: VZ at 05.02.00 to derive from wxStatusBarBase
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by: VZ at 05.02.00 to derive from wxStatusBarBase
 // 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 _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;
+extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;

 
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
 public:
   wxStatusBarGeneric() { Init(); }
   wxStatusBarGeneric(wxWindow *parent,
 
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
 public:
   wxStatusBarGeneric() { Init(); }
   wxStatusBarGeneric(wxWindow *parent,

-              wxWindowID id,
+              wxWindowID winid,

               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,

-              long style = 0,
+              long style = wxFULL_REPAINT_ON_RESIZE,

               const wxString& name = wxPanelNameStr)
   {
       Init();
 
               const wxString& name = wxPanelNameStr)
   {
       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,
               const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
               const wxSize& WXUNUSED(size) = wxDefaultSize,

-              long style = 0,
+              long style = wxFULL_REPAINT_ON_RESIZE,

               const wxString& name = wxPanelNameStr)
   {
               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);
 


@@ -92,7 +93,7 @@ public:
   void SetBorderY(int y);
 
   void OnPaint(wxPaintEvent& event);
   void SetBorderY(int y);
 
   void OnPaint(wxPaintEvent& event);

-  
+

   void OnLeftDown(wxMouseEvent& event);
   void OnRightDown(wxMouseEvent& event);
 
   void OnLeftDown(wxMouseEvent& event);
   void OnRightDown(wxMouseEvent& event);
 


@@ -114,16 +115,15 @@ protected:
 
   int               m_borderX;
   int               m_borderY;
 
   int               m_borderX;
   int               m_borderY;

-  wxFont            m_defaultStatusBarFont;

   wxPen             m_mediumShadowPen;
   wxPen             m_hilightPen;
 
   wxPen             m_mediumShadowPen;
   wxPen             m_hilightPen;
 

+  virtual wxSize DoGetBestSize() const;
+

 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