add @DATE@, @TIME@ and @TITLE@ macros to HTML printing (extended/modified patch 1528679)

[wxWidgets.git] / src / generic / statusbr.cpp

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 372a82a5c5258534bc2ab589b9a1d5cc8c9a0b20..bb1b36f5604b6b3cce375bef2602e076295769ad 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        generic/statusbr.cpp
+// Name:        src/generic/statusbr.cpp
 // Purpose:     wxStatusBarGeneric class implementation
 // Author:      Julian Smart
 // Modified by:
@@ -9,24 +9,21 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "statusbr.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_STATUSBAR
 
+#include "wx/statusbr.h"
+
 #ifndef WX_PRECOMP
-#include "wx/setup.h"
-#include "wx/frame.h"
-#include "wx/settings.h"
-#include "wx/dcclient.h"
+    #include "wx/frame.h"
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"
 #endif
 
 #ifdef __WXGTK20__
@@ -34,8 +31,6 @@
 #include "wx/gtk/win_gtk.h"
 #endif
 
-#include "wx/statusbr.h"
-
 // we only have to do it here when we use wxStatusBarGeneric in addition to the
 // standard wxStatusBar class, if wxStatusBarGeneric is the same as
 // wxStatusBar, then the corresponding IMPLEMENT_DYNAMIC_CLASS is already in
@@ -56,20 +51,15 @@ END_EVENT_TABLE()
 
 // Default status border dimensions
 #define         wxTHICK_LINE_BORDER 2
-#define         wxTHICK_LINE_WIDTH  1
 
 void wxStatusBarGeneric::Init()
 {
-  m_borderX = wxTHICK_LINE_BORDER;
-  m_borderY = wxTHICK_LINE_BORDER;
+    m_borderX = wxTHICK_LINE_BORDER;
+    m_borderY = wxTHICK_LINE_BORDER;
 }
 
 wxStatusBarGeneric::~wxStatusBarGeneric()
 {
-    // VZ: what is this for? please comment...
-#ifdef __WXMSW__
-    SetFont(wxNullFont);
-#endif // MSW
 }
 
 bool wxStatusBarGeneric::Create(wxWindow *parent,
@@ -77,38 +67,34 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
                                 long style,
                                 const wxString& name)
 {
-  if ( !wxWindow::Create(parent, id,
-                         wxDefaultPosition, wxDefaultSize,
-                         style | wxTAB_TRAVERSAL, name) )
-      return false;
+    if ( !wxWindow::Create(parent, id,
+                           wxDefaultPosition, wxDefaultSize,
+                           style | wxTAB_TRAVERSAL, name) )
+        return false;
 
-  // The status bar should have a themed background
-  SetThemeEnabled( true );
+    // The status bar should have a themed background
+    SetThemeEnabled( true );
+
+    InitColours();
 
-  // Don't wish this to be found as a child
-#ifndef __WXMAC__
-  parent->GetChildren().DeleteObject(this);
-#endif
-  InitColours();
-  
 #ifdef __WXPM__
-  SetFont(*wxSMALL_FONT);
+    SetFont(*wxSMALL_FONT);
 #endif
 
-  // Set the height according to the font and the border size
-  wxClientDC dc(this);
-  dc.SetFont(GetFont());
+    // Set the height according to the font and the border size
+    wxClientDC dc(this);
+    dc.SetFont(GetFont());
 
-  wxCoord y;
-  dc.GetTextExtent(_T("X"), NULL, &y );
+    wxCoord y;
+    dc.GetTextExtent(_T("X"), NULL, &y );
 
-  int height = (int)( (11*y)/10 + 2*GetBorderY());
+    int height = (int)( (11*y)/10 + 2*GetBorderY());
 
-  SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);
+    SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);
 
-  SetFieldsCount(1);
+    SetFieldsCount(1);
 
-  return true;
+    return true;
 }
 
 
@@ -221,48 +207,48 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
     }
 #endif
 
-  if (GetFont().Ok())
+    if (GetFont().Ok())
         dc.SetFont(GetFont());
 
-  dc.SetBackgroundMode(wxTRANSPARENT);
+    dc.SetBackgroundMode(wxTRANSPARENT);
 
 #ifdef __WXPM__
-  wxColour vColor;
+    wxColour vColor;
 
-  vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR);
-  ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
+    vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR);
+    ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
 #endif
 
-  for (int i = 0; i < m_nFields; i ++)
+    for (int i = 0; i < m_nFields; i ++)
         DrawField(dc, i);
 }
 
 void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i)
 {
-  int leftMargin = 2;
+    int leftMargin = 2;
 
-  wxRect rect;
-  GetFieldRect(i, rect);
+    wxRect rect;
+    GetFieldRect(i, rect);
 
-  wxString text(GetStatusText(i));
+    wxString text(GetStatusText(i));
 
-  long x, y;
+    long x = 0, y = 0;
 
-  dc.GetTextExtent(text, &x, &y);
+    dc.GetTextExtent(text, &x, &y);
 
-  int xpos = rect.x + leftMargin;
-  int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ;
+    int xpos = rect.x + leftMargin;
+    int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ;
 
 #if defined( __WXGTK__ ) || defined(__WXMAC__)
-  xpos++;
-  ypos++;
+    xpos++;
+    ypos++;
 #endif
 
-  dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
+    dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
 
-  dc.DrawText(text, xpos, ypos);
+    dc.DrawText(text, xpos, ypos);
 
-  dc.DestroyClippingRegion();
+    dc.DestroyClippingRegion();
 }
 
 void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
@@ -364,7 +350,7 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
 void wxStatusBarGeneric::InitColours()
 {
     // Shadow colours
-#if defined(__WIN95__) || defined(__WXMAC__)
+#if defined(__WXMSW__) || defined(__WXMAC__)
     wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
     m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
 
@@ -372,17 +358,13 @@ void wxStatusBarGeneric::InitColours()
     m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
 #elif defined(__WXPM__)
     m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);
-    m_hilightPen = wxPen("WHITE", 1, wxSOLID);
+    m_hilightPen = *wxWHITE_PEN;
 
-    wxColour                        vColour;
-
-    vColour.Set(wxString("LIGHT GREY"));
-    SetBackgroundColour(vColour);
-    vColour.Set(wxString("BLACK"));
-    SetForegroundColour(vColour);
+    SetBackgroundColour(*wxLIGHT_GREY);
+    SetForegroundColour(*wxBLACK);
 #else
-    m_mediumShadowPen = wxPen("GREY", 1, wxSOLID);
-    m_hilightPen = wxPen("WHITE", 1, wxSOLID);
+    m_mediumShadowPen = *wxGREY_PEN;
+    m_hilightPen = *wxWHITE_PEN;
 #endif
 }
 
@@ -479,4 +461,3 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
 }
 
 #endif // wxUSE_STATUSBAR
-