[gtk] fixed bug that caused segfaults in wxYield when wxToolBar has non-button contr...

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 13c524247e8003fa5bfd9bb20e5a27d90c1a9df7..98dc359b260f7c2f59ec70d14f740dcdc3c56251 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -31,11 +31,7 @@
 
 #ifdef __WXMSW__
 #include <windows.h>
 
 #ifdef __WXMSW__
 #include <windows.h>

-
-#ifdef DrawText
-#undef DrawText
-#endif
-
+#include "wx/msw/winundef.h"

 #endif
 
 #if !USE_SHARED_LIBRARY
 #endif
 
 #if !USE_SHARED_LIBRARY


@@ -84,11 +80,12 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID id,
   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
 
   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
 

-  bool success = wxWindow::Create(parent, id, pos, size, style, name);
+  bool success = wxWindow::Create(parent, id, pos, size, style | wxTAB_TRAVERSAL, name);

 
   // Don't wish this to be found as a child
 
   // Don't wish this to be found as a child

+#ifndef __WXMAC__

   parent->GetChildren().DeleteObject(this);
   parent->GetChildren().DeleteObject(this);

-
+#endif

   InitColours();
 
   SetFont(m_defaultStatusBarFont);
   InitColours();
 
   SetFont(m_defaultStatusBarFont);


@@ -199,6 +196,11 @@ void wxStatusBar::DrawFieldText(wxDC& dc, int i)
 
   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++;
+#endif

 
   dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
 
 
   dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);