Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The statusbar should start with one field, not zero

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-03-11 00:01:03 +00:00
parent 271d1110ed
commit 8aa2cea1d0
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/generic/statusbr.cpp
View File

@@ -104,6 +104,8 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
SetSize(-1, -1, -1, height); SetSize(-1, -1, -1, height);
SetFieldsCount(1);
return TRUE; return TRUE;
} }
@@ -181,7 +183,7 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
{ {
int width, height; int width, height;
GetClientSize(&width, &height); GetClientSize(&width, &height);
gtk_paint_resize_grip( m_widget->style, gtk_paint_resize_grip( m_widget->style,
GTK_PIZZA(m_wxwindow)->bin_window, GTK_PIZZA(m_wxwindow)->bin_window,
(GtkStateType) GTK_WIDGET_STATE (m_widget), (GtkStateType) GTK_WIDGET_STATE (m_widget),
@@ -190,13 +192,13 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
"statusbar", "statusbar",
GDK_WINDOW_EDGE_SOUTH_EAST, GDK_WINDOW_EDGE_SOUTH_EAST,
width-height-2, 1, height-2, height-3 ); width-height-2, 1, height-2, height-3 );
} }
#endif #endif
if (GetFont().Ok()) if (GetFont().Ok())
dc.SetFont(GetFont()); dc.SetFont(GetFont());
dc.SetBackgroundMode(wxTRANSPARENT); dc.SetBackgroundMode(wxTRANSPARENT);
#ifdef __WXPM__ #ifdef __WXPM__
@@ -385,7 +387,7 @@ void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
#ifdef __WXGTK20__ #ifdef __WXGTK20__
int width, height; int width, height;
GetClientSize(&width, &height); GetClientSize(&width, &height);
if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height)) if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height))
{ {
GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget ); GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
@@ -402,8 +404,8 @@ void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
gtk_window_begin_resize_drag (GTK_WINDOW (ancestor), gtk_window_begin_resize_drag (GTK_WINDOW (ancestor),
GDK_WINDOW_EDGE_SOUTH_EAST, GDK_WINDOW_EDGE_SOUTH_EAST,
1, 1,
org_x + event.GetX(), org_x + event.GetX(),
org_y + event.GetY(), org_y + event.GetY(),
0); 0);
} }
else else
@@ -420,7 +422,7 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
#ifdef __WXGTK20__ #ifdef __WXGTK20__
int width, height; int width, height;
GetClientSize(&width, &height); GetClientSize(&width, &height);
if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height)) if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height))
{ {
GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget ); GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
@@ -433,11 +435,11 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
int org_x = 0; int org_x = 0;
int org_y = 0; int org_y = 0;
gdk_window_get_origin( source, &org_x, &org_y ); gdk_window_get_origin( source, &org_x, &org_y );
gtk_window_begin_move_drag (GTK_WINDOW (ancestor), gtk_window_begin_move_drag (GTK_WINDOW (ancestor),
2, 2,
org_x + event.GetX(), org_x + event.GetX(),
org_y + event.GetY(), org_y + event.GetY(),
0); 0);
} }
else else