added XRC handler for wxStdDialogButtonSizer

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index c12bce49e7d37b1a45b6e38b3a92177a900dfab7..e0bd6f8d084fa10a4c00d52244bf9093d52bfc11 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -66,10 +66,6 @@ void wxStatusBarGeneric::Init()
 
 wxStatusBarGeneric::~wxStatusBarGeneric()
 {
 
 wxStatusBarGeneric::~wxStatusBarGeneric()
 {

-    // VZ: what is this for? please comment...
-#ifdef __WXMSW__
-    SetFont(wxNullFont);
-#endif // MSW

 }
 
 bool wxStatusBarGeneric::Create(wxWindow *parent,
 }
 
 bool wxStatusBarGeneric::Create(wxWindow *parent,


@@ -80,18 +76,16 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
   if ( !wxWindow::Create(parent, id,
                          wxDefaultPosition, wxDefaultSize,
                          style | wxTAB_TRAVERSAL, name) )
   if ( !wxWindow::Create(parent, id,
                          wxDefaultPosition, wxDefaultSize,
                          style | wxTAB_TRAVERSAL, name) )

-      return FALSE;
+      return false;

 
   // The status bar should have a themed background
 
   // The status bar should have a themed background

-  SetThemeEnabled( TRUE );
+  SetThemeEnabled( true );

 
 

-  // Don't wish this to be found as a child
-#ifndef __WXMAC__
-  parent->GetChildren().DeleteObject(this);
-#endif

   InitColours();
   InitColours();

-
-  SetFont(m_defaultStatusBarFont);
+  
+#ifdef __WXPM__
+  SetFont(*wxSMALL_FONT);
+#endif

 
   // Set the height according to the font and the border size
   wxClientDC dc(this);
 
   // Set the height according to the font and the border size
   wxClientDC dc(this);


@@ -102,11 +96,11 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
 
   int height = (int)( (11*y)/10 + 2*GetBorderY());
 
 
   int height = (int)( (11*y)/10 + 2*GetBorderY());
 

-  SetSize(-1, -1, -1, height);
+  SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);

 
   SetFieldsCount(1);
 
 
   SetFieldsCount(1);
 

-  return TRUE;
+  return true;

 }
 
 
 }
 
 


@@ -125,7 +119,7 @@ wxSize wxStatusBarGeneric::DoGetBestSize() const
     height = (int)( (11*y)/10 + 2*GetBorderY());
 
     return wxSize(width, height);
     height = (int)( (11*y)/10 + 2*GetBorderY());
 
     return wxSize(width, height);

-}    
+}

 
 void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
 {
 
 void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
 {


@@ -138,12 +132,13 @@ void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
     for (i = m_nFields - 1; i >= number; --i)
         m_statusStrings.RemoveAt(i);
 
     for (i = m_nFields - 1; i >= number; --i)
         m_statusStrings.RemoveAt(i);
 

-    m_nFields = number;
+    // forget the old cached pixel widths
+    m_widthsAbs.Empty();
+
+    wxStatusBarBase::SetFieldsCount(number, widths);

 
     wxASSERT_MSG( m_nFields == (int)m_statusStrings.GetCount(),
                   _T("This really should never happen, can we do away with m_nFields here?") );
 
     wxASSERT_MSG( m_nFields == (int)m_statusStrings.GetCount(),
                   _T("This really should never happen, can we do away with m_nFields here?") );

-
-    SetStatusWidths(number, widths);

 }
 
 void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
 }
 
 void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)


@@ -159,7 +154,7 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
         wxRect rect;
         GetFieldRect(number, rect);
 
         wxRect rect;
         GetFieldRect(number, rect);
 

-        Refresh( TRUE, &rect );
+        Refresh( true, &rect );

     }
 }
 
     }
 }
 


@@ -267,43 +262,52 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
     wxRect rect;
     GetFieldRect(i, rect);
 
     wxRect rect;
     GetFieldRect(i, rect);
 

-    // Draw border
-    // Have grey background, plus 3-d border -
-    // One black rectangle.
-    // Inside this, left and top sides - dark grey. Bottom and right -
-    // white.
-
-    dc.SetPen(m_hilightPen);
+    int style = wxSB_NORMAL;
+    if (m_statusStyles)
+        style = m_statusStyles[i];

 
 

-#ifndef __WXPM__
-
-    // Right and bottom white lines
-    dc.DrawLine(rect.x + rect.width, rect.y,
-                rect.x + rect.width, rect.y + rect.height);
-    dc.DrawLine(rect.x + rect.width, rect.y + rect.height,
-                rect.x, rect.y + rect.height);
-
-    dc.SetPen(m_mediumShadowPen);
-
-    // Left and top grey lines
-    dc.DrawLine(rect.x, rect.y + rect.height,
-           rect.x, rect.y);
-    dc.DrawLine(rect.x, rect.y,
-        rect.x + rect.width, rect.y);
-#else
-
-    dc.DrawLine(rect.x + rect.width, rect.height + 2,
-                rect.x, rect.height + 2);
-    dc.DrawLine(rect.x + rect.width, rect.y,
-                rect.x + rect.width, rect.y + rect.height);
-
-    dc.SetPen(m_mediumShadowPen);
-    dc.DrawLine(rect.x, rect.y,
-                rect.x + rect.width, rect.y);
-    dc.DrawLine(rect.x, rect.y + rect.height,
-                rect.x, rect.y);
+    if (style != wxSB_FLAT)
+    {
+        // Draw border
+        // For wxSB_NORMAL:
+        // Have grey background, plus 3-d border -
+        // One black rectangle.
+        // Inside this, left and top sides - dark grey. Bottom and right -
+        // white.
+        // Reverse it for wxSB_RAISED
+
+        dc.SetPen((style == wxSB_RAISED) ? m_mediumShadowPen : m_hilightPen);
+
+    #ifndef __WXPM__
+
+        // Right and bottom lines
+        dc.DrawLine(rect.x + rect.width, rect.y,
+                    rect.x + rect.width, rect.y + rect.height);
+        dc.DrawLine(rect.x + rect.width, rect.y + rect.height,
+                    rect.x, rect.y + rect.height);
+
+        dc.SetPen((style == wxSB_RAISED) ? m_hilightPen : m_mediumShadowPen);
+
+        // Left and top lines
+        dc.DrawLine(rect.x, rect.y + rect.height,
+               rect.x, rect.y);
+        dc.DrawLine(rect.x, rect.y,
+            rect.x + rect.width, rect.y);
+    #else
+
+        dc.DrawLine(rect.x + rect.width, rect.height + 2,
+                    rect.x, rect.height + 2);
+        dc.DrawLine(rect.x + rect.width, rect.y,
+                    rect.x + rect.width, rect.y + rect.height);
+
+        dc.SetPen((style == wxSB_RAISED) ? m_hilightPen : m_mediumShadowPen);
+        dc.DrawLine(rect.x, rect.y,
+                    rect.x + rect.width, rect.y);
+        dc.DrawLine(rect.x, rect.y + rect.height,
+                   rect.x, rect.y);

 
 #endif
 
 #endif

+    }

 
     DrawFieldText(dc, i);
 }
 
     DrawFieldText(dc, i);
 }


@@ -311,7 +315,7 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
   // Get the position and size of the field's internal bounding rectangle
 bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
 {
   // Get the position and size of the field's internal bounding rectangle
 bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
 {

-    wxCHECK_MSG( (n >= 0) && (n < m_nFields), FALSE,
+    wxCHECK_MSG( (n >= 0) && (n < m_nFields), false,

                  _T("invalid status bar field index") );
 
     // FIXME: workarounds for OS/2 bugs have nothing to do here (VZ)
                  _T("invalid status bar field index") );
 
     // FIXME: workarounds for OS/2 bugs have nothing to do here (VZ)


@@ -345,7 +349,7 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
     rect.width = m_widthsAbs[n] - 2*m_borderX;
     rect.height = height - 2*m_borderY;
 
     rect.width = m_widthsAbs[n] - 2*m_borderX;
     rect.height = height - 2*m_borderY;
 

-    return TRUE;
+    return true;

 }
 
 // Initialize colours
 }
 
 // Initialize colours


@@ -368,23 +372,16 @@ void wxStatusBarGeneric::InitColours()
     SetBackgroundColour(vColour);
     vColour.Set(wxString("BLACK"));
     SetForegroundColour(vColour);
     SetBackgroundColour(vColour);
     vColour.Set(wxString("BLACK"));
     SetForegroundColour(vColour);

-    m_defaultStatusBarFont = *wxSMALL_FONT;

 #else
     m_mediumShadowPen = wxPen("GREY", 1, wxSOLID);
     m_hilightPen = wxPen("WHITE", 1, wxSOLID);
 #endif
 #else
     m_mediumShadowPen = wxPen("GREY", 1, wxSOLID);
     m_hilightPen = wxPen("WHITE", 1, wxSOLID);
 #endif

-
-#ifndef __WXPM__
-    m_defaultStatusBarFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-#endif

 }
 
 // Responds to colour changes, and passes event on to children.
 void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     InitColours();
 }
 
 // Responds to colour changes, and passes event on to children.
 void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     InitColours();

-    Refresh();

 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);


@@ -400,7 +397,7 @@ void wxStatusBarGeneric::SetMinHeight(int height)
 
     if ( height > (11*y)/10 )
     {
 
     if ( height > (11*y)/10 )
     {

-        SetSize(-1, -1, -1, height + 2*m_borderY);
+        SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height + 2*m_borderY);

     }
 }
 
     }
 }
 


@@ -432,10 +429,10 @@ void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
     }
     else
     {
     }
     else
     {

-        event.Skip( TRUE );
+        event.Skip( true );

     }
 #else
     }
 #else

-    event.Skip( TRUE );
+    event.Skip( true );

 #endif
 }
 
 #endif
 }
 


@@ -466,10 +463,10 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
     }
     else
     {
     }
     else
     {

-        event.Skip( TRUE );
+        event.Skip( true );

     }
 #else
     }
 #else

-    event.Skip( TRUE );
+    event.Skip( true );

 #endif
 }
 
 #endif
 }