Honous initial position for wxSpinCtrl.

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index fea9c6ad980349d54f4849cacf6e568521cda2bd..0b8cb4868c7c8ca380b776961d9d0e3d83773f78 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -56,20 +56,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 +72,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;
 }
 
 
@@ -140,6 +131,9 @@ void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
     for (i = m_nFields - 1; i >= number; --i)
         m_statusStrings.RemoveAt(i);
 
+    // forget the old cached pixel widths
+    m_widthsAbs.Empty();
+
     wxStatusBarBase::SetFieldsCount(number, widths);
 
     wxASSERT_MSG( m_nFields == (int)m_statusStrings.GetCount(),
@@ -218,48 +212,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, y;
 
-  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)
@@ -369,13 +363,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 = wxPen(_T("WHITE"), 1, wxSOLID);
 
     wxColour                        vColour;
 
-    vColour.Set(wxString("LIGHT GREY"));
+    vColour.Set(wxString(_T("LIGHT GREY")));
     SetBackgroundColour(vColour);
-    vColour.Set(wxString("BLACK"));
+    vColour.Set(wxString(_T("BLACK")));
     SetForegroundColour(vColour);
 #else
     m_mediumShadowPen = wxPen("GREY", 1, wxSOLID);
@@ -476,4 +470,3 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
 }
 
 #endif // wxUSE_STATUSBAR
-