wxLB_MULTIPLE is same as wxLB_EXTENDED in wxGTK2

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

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 3c4e447a3b83455a9e37acfb5efe4d3bf4dc0c9e..8c817a5ab3cd381d28a787872807a72a393671ab 100644 (file)
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -30,10 +30,9 @@
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"

+    #include "wx/toplevel.h"

 #endif
 
 #endif
 

-#include "wx/toplevel.h"
-

 #include "wx/univ/renderer.h"
 
 // ============================================================================
 #include "wx/univ/renderer.h"
 
 // ============================================================================


@@ -87,7 +86,8 @@ wxRect wxStatusBarUniv::GetTotalFieldRect(wxCoord *borderBetweenFields)
 
     // no, don't do this - the borders are meant to be inside this rect
     // wxSize sizeBorders =
 
     // no, don't do this - the borders are meant to be inside this rect
     // wxSize sizeBorders =

-    m_renderer->GetStatusBarBorders(borderBetweenFields);
+    if ( borderBetweenFields )
+        *borderBetweenFields = m_renderer->GetStatusBarBorderBetweenFields();

     //rect.Deflate(sizeBorders.x, sizeBorders.y);
 
     // recalc the field widths if needed
     //rect.Deflate(sizeBorders.x, sizeBorders.y);
 
     // recalc the field widths if needed


@@ -110,7 +110,8 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
 
     // prepare the DC
     wxDC& dc = renderer->GetDC();
 
     // prepare the DC
     wxDC& dc = renderer->GetDC();

-    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+    dc.SetFont(GetFont());
+    dc.SetTextForeground(GetForegroundColour());

 
     // do draw the fields
     int flags = IsEnabled() ? 0 : (int)wxCONTROL_DISABLED;
 
     // do draw the fields
     int flags = IsEnabled() ? 0 : (int)wxCONTROL_DISABLED;


@@ -130,11 +131,7 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
                  GetParent()->HasFlag(wxRESIZE_BORDER) &&
                  parentTLW && !parentTLW->IsMaximized() )
             {
                  GetParent()->HasFlag(wxRESIZE_BORDER) &&
                  parentTLW && !parentTLW->IsMaximized() )
             {

-                // NB: we use wxCONTROL_ISDEFAULT for this because it doesn't
-                //     have any meaning for the status bar otherwise anyhow
-                //     (it's still ugly, of course, but there are too few flags
-                //     to squander them for things like this)
-                flags |= wxCONTROL_ISDEFAULT;
+                flags |= wxCONTROL_SIZEGRIP;

             }
 
             int style;
             }
 
             int style;


@@ -290,10 +287,7 @@ wxRect wxStatusBarUniv::DoGetFieldRect(int n) const
 
 wxCoord wxStatusBarUniv::GetHeight() const
 {
 
 wxCoord wxStatusBarUniv::GetHeight() const
 {

-    wxClientDC dc(wxConstCast(this, wxStatusBarUniv));
-    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-
-    return dc.GetCharHeight() + 2*GetBorderY();
+    return GetCharHeight() + 2*GetBorderY();

 }
 
 wxSize wxStatusBarUniv::DoGetBestSize() const
 }
 
 wxSize wxStatusBarUniv::DoGetBestSize() const


@@ -319,12 +313,14 @@ void wxStatusBarUniv::SetMinHeight(int WXUNUSED(height))
 
 int wxStatusBarUniv::GetBorderX() const
 {
 
 int wxStatusBarUniv::GetBorderX() const
 {

-    return m_renderer->GetStatusBarBorders(NULL).x;
+    return m_renderer->GetStatusBarBorders().x +
+           m_renderer->GetStatusBarFieldMargins().x;

 }
 
 int wxStatusBarUniv::GetBorderY() const
 {
 }
 
 int wxStatusBarUniv::GetBorderY() const
 {

-    return m_renderer->GetStatusBarBorders(NULL).y;
+    return m_renderer->GetStatusBarBorders().y +
+           m_renderer->GetStatusBarFieldMargins().y;

 }
 
 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR