64/32 bit fixes

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 831d2d8717e73454eccb8cd5ab742341b9f31f5a..ea0ce7e59dca6b8e119153465dcf2f640bbcfa38 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:
 // Purpose:     wxStatusBarGeneric class implementation
 // Author:      Julian Smart
 // Modified by:


@@ -9,33 +9,27 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_STATUSBAR
 
 #endif
 
 #if wxUSE_STATUSBAR
 

+#include "wx/statusbr.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/setup.h"
-#include "wx/frame.h"
-#include "wx/settings.h"
-#include "wx/dcclient.h"
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"
+    #include "wx/toplevel.h"

 #endif
 
 #ifdef __WXGTK20__
 #endif
 
 #ifdef __WXGTK20__

-#include "wx/gtk/private.h"
-#include "wx/gtk/win_gtk.h"
+    #include <gtk/gtk.h>

 #endif
 
 #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
 // 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 +50,15 @@ END_EVENT_TABLE()
 
 // Default status border dimensions
 #define         wxTHICK_LINE_BORDER 2
 
 // Default status border dimensions
 #define         wxTHICK_LINE_BORDER 2

-#define         wxTHICK_LINE_WIDTH  1

 
 void wxStatusBarGeneric::Init()
 {
 
 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()
 {
 }
 
 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,


@@ -77,38 +66,36 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
                                 long style,
                                 const wxString& name)
 {
                                 long style,
                                 const wxString& name)
 {

-  if ( !wxWindow::Create(parent, id,
-                         wxDefaultPosition, wxDefaultSize,
-                         style | wxTAB_TRAVERSAL, name) )
-      return false;
+    style |= wxTAB_TRAVERSAL | wxFULL_REPAINT_ON_RESIZE;
+    if ( !wxWindow::Create(parent, id,
+                           wxDefaultPosition, wxDefaultSize,
+                           style, 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__
 #ifdef __WXPM__

-  SetFont(*wxSMALL_FONT);
+    SetFont(*wxSMALL_FONT);

 #endif
 
 #endif
 

-  // 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;
+    {
+        // Set the height according to the font and the border size
+        wxClientDC dc(this);
+        dc.SetFont(GetFont());

 
 

-  int height = (int)( (11*y)/10 + 2*GetBorderY());
+        dc.GetTextExtent(_T("X"), NULL, &y );
+    }
+    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,11 +127,11 @@ 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);
 

-    wxStatusBarBase::SetFieldsCount(number, widths);
-

     // forget the old cached pixel widths
     m_widthsAbs.Empty();
 
     // 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?") );
 }


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

-        Refresh( true, &rect );
+        Refresh(true, &rect);
+
+        // it's common to show some text in the status bar before starting a
+        // relatively lengthy operation, ensure that the text is shown to the
+        // user immediately and not after the lengthy operation end
+        Update();

     }
 }
 
     }
 }
 


@@ -198,71 +190,87 @@ void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[])
     wxStatusBarBase::SetStatusWidths(n, widths_field);
 }
 
     wxStatusBarBase::SetStatusWidths(n, widths_field);
 }
 

+bool wxStatusBarGeneric::ShowsSizeGrip() const
+{
+    if ( !HasFlag(wxST_SIZEGRIP) )
+        return false;
+
+    wxTopLevelWindow * const
+        tlw = wxDynamicCast(wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
+    return tlw && !tlw->IsMaximized() && tlw->HasFlag(wxRESIZE_BORDER);
+}
+

 void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC dc(this);
 
 #ifdef __WXGTK20__
     // Draw grip first
 void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC dc(this);
 
 #ifdef __WXGTK20__
     // Draw grip first

-    if (HasFlag( wxST_SIZEGRIP ))
+    if ( ShowsSizeGrip() )

     {
         int width, height;
         GetClientSize(&width, &height);
 
     {
         int width, height;
         GetClientSize(&width, &height);
 

-        gtk_paint_resize_grip( m_widget->style,
-                               GTK_PIZZA(m_wxwindow)->bin_window,
+        if (GetLayoutDirection() == wxLayout_RightToLeft)
+        {
+            gtk_paint_resize_grip( m_widget->style,
+                               GTKGetDrawingWindow(),
+                               (GtkStateType) GTK_WIDGET_STATE (m_widget),
+                               NULL,
+                               m_widget,
+                               "statusbar",
+                               GDK_WINDOW_EDGE_SOUTH_WEST,
+                               2, 2, height-2, height-4 );
+        }
+        else
+        {
+            gtk_paint_resize_grip( m_widget->style,
+                               GTKGetDrawingWindow(),

                                (GtkStateType) GTK_WIDGET_STATE (m_widget),
                                NULL,
                                m_widget,
                                "statusbar",
                                GDK_WINDOW_EDGE_SOUTH_EAST,
                                (GtkStateType) GTK_WIDGET_STATE (m_widget),
                                NULL,
                                m_widget,
                                "statusbar",
                                GDK_WINDOW_EDGE_SOUTH_EAST,

-                               width-height-2, 1, height-2, height-3 );
-
+                               width-height-2, 2, height-2, height-4 );
+        }

     }
     }

-#endif
+#endif // __WXGTK20__

 
 

-  if (GetFont().Ok())
+    if (GetFont().Ok())

         dc.SetFont(GetFont());
 
         dc.SetFont(GetFont());
 

-  dc.SetBackgroundMode(wxTRANSPARENT);
-
-#ifdef __WXPM__
-  wxColour vColor;
-
-  vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR);
-  ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
-#endif
+    dc.SetBackgroundMode(wxTRANSPARENT);

 
 

-  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)
 {
         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;
+    wxCoord 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__)
 
 #if defined( __WXGTK__ ) || defined(__WXMAC__)

-  xpos++;
-  ypos++;
+    xpos++;
+    ypos++;

 #endif
 
 #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)
 }
 
 void wxStatusBarGeneric::DrawField(wxDC& dc, int i)


@@ -363,27 +371,16 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
 // Initialize colours
 void wxStatusBarGeneric::InitColours()
 {
 // Initialize colours
 void wxStatusBarGeneric::InitColours()
 {

-    // Shadow colours
-#if defined(__WIN95__) || defined(__WXMAC__)
-    wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
-    m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
-
-    wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
-    m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
-#elif defined(__WXPM__)
+#if defined(__WXPM__)

     m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);
     m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);

-    m_hilightPen = wxPen("WHITE", 1, wxSOLID);
-
-    wxColour                        vColour;
-
-    vColour.Set(wxString("LIGHT GREY"));
-    SetBackgroundColour(vColour);
-    vColour.Set(wxString("BLACK"));
-    SetForegroundColour(vColour);
-#else
-    m_mediumShadowPen = wxPen("GREY", 1, wxSOLID);
-    m_hilightPen = wxPen("WHITE", 1, wxSOLID);
-#endif
+    m_hilightPen = *wxWHITE_PEN;
+
+    SetBackgroundColour(*wxLIGHT_GREY);
+    SetForegroundColour(*wxBLACK);
+#else // !__WXPM__
+    m_mediumShadowPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
+    m_hilightPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
+#endif // __WXPM__/!__WXPM__

 }
 
 // Responds to colour changes, and passes event on to children.
 }
 
 // Responds to colour changes, and passes event on to children.


@@ -415,25 +412,37 @@ void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
     int width, height;
     GetClientSize(&width, &height);
 
     int width, height;
     GetClientSize(&width, &height);
 

-    if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height))
+    if ( ShowsSizeGrip()  && (event.GetX() > width-height) )

     {
         GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
 
         if (!GTK_IS_WINDOW (ancestor))
             return;
 
     {
         GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
 
         if (!GTK_IS_WINDOW (ancestor))
             return;
 

-        GdkWindow *source = GTK_PIZZA(m_wxwindow)->bin_window;
+        GdkWindow *source = GTKGetDrawingWindow();

 
         int org_x = 0;
         int org_y = 0;
         gdk_window_get_origin( source, &org_x, &org_y );
 
 
         int org_x = 0;
         int org_y = 0;
         gdk_window_get_origin( source, &org_x, &org_y );
 

-        gtk_window_begin_resize_drag (GTK_WINDOW (ancestor),
+        if (GetLayoutDirection() == wxLayout_RightToLeft)
+        {
+            gtk_window_begin_resize_drag (GTK_WINDOW (ancestor),
+                                  GDK_WINDOW_EDGE_SOUTH_WEST,
+                                  1,
+                                  org_x - event.GetX() + GetSize().x ,
+                                  org_y + event.GetY(),
+                                  0);
+        }
+        else
+        {
+            gtk_window_begin_resize_drag (GTK_WINDOW (ancestor),

                                   GDK_WINDOW_EDGE_SOUTH_EAST,
                                   1,
                                   org_x + event.GetX(),
                                   org_y + event.GetY(),
                                   0);
                                   GDK_WINDOW_EDGE_SOUTH_EAST,
                                   1,
                                   org_x + event.GetX(),
                                   org_y + event.GetY(),
                                   0);

+        }

     }
     else
     {
     }
     else
     {


@@ -450,14 +459,14 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
     int width, height;
     GetClientSize(&width, &height);
 
     int width, height;
     GetClientSize(&width, &height);
 

-    if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height))
+    if ( ShowsSizeGrip() && (event.GetX() > width-height) )

     {
         GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
 
         if (!GTK_IS_WINDOW (ancestor))
             return;
 
     {
         GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
 
         if (!GTK_IS_WINDOW (ancestor))
             return;
 

-        GdkWindow *source = GTK_PIZZA(m_wxwindow)->bin_window;
+        GdkWindow *source = GTKGetDrawingWindow();

 
         int org_x = 0;
         int org_y = 0;
 
         int org_x = 0;
         int org_y = 0;


@@ -479,4 +488,3 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
 }
 
 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR

-