applied (slightly modified) wxGLApp patch for MSW

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index c42e2132091818f925c22431499b42035d7dad34..e1739aa5c326d84aad43d5e4523959f8a14b865c 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -20,7 +20,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-//#if !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR
+#if wxUSE_STATUSBAR

 
 #ifndef WX_PRECOMP
 #include "wx/setup.h"
 
 #ifndef WX_PRECOMP
 #include "wx/setup.h"


@@ -184,7 +184,7 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
 #ifdef __WXPM__
   wxColour                          vColor;
 
 #ifdef __WXPM__
   wxColour                          vColor;
 

-  vColor.InitFromName("DIM GREY");
+  vColor.InitFromName("GREY");

   ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
 #endif
 
   ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
 #endif
 


@@ -207,21 +207,11 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i)
 
   long x, y;
 
 
   long x, y;
 

-#if defined(__WXPM__)
-  long decsent;
-
-  dc.GetTextExtent(text, &x, &y,&decsent);
-  int xpos = rect.x + leftMargin;
-  int ypos = (int) (((rect.height - y + 1) / 2 ) + rect.y + decsent ) ;
-
-#else

   dc.GetTextExtent(text, &x, &y);
 
   int xpos = rect.x + leftMargin;
   int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ;
 
   dc.GetTextExtent(text, &x, &y);
 
   int xpos = rect.x + leftMargin;
   int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ;
 

-#endif // __WXPM__
-

 #if defined( __WXGTK__ ) || defined(__WXMAC__)
   xpos++;
   ypos++;
 #if defined( __WXGTK__ ) || defined(__WXMAC__)
   xpos++;
   ypos++;


@@ -264,21 +254,21 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
         rect.x + rect.width, rect.y);
 #else
     // Right
         rect.x + rect.width, rect.y);
 #else
     // Right

-    dc.DrawLine(rect.x + rect.width, rect.y - 3,
-                rect.x + rect.width, rect.y + rect.height);
+    dc.DrawLine(rect.x + rect.width, rect.y,
+                rect.x + rect.width, rect.y + rect.height + 2);

     dc.SetPen(m_mediumShadowPen);
     dc.SetPen(m_mediumShadowPen);

-    dc.DrawLine(rect.x + rect.width + 1, rect.y - 3,
-                rect.x + rect.width + 1, rect.y + rect.height);
-    dc.DrawLine(rect.x + rect.width + 2, rect.y - 3,
-                rect.x + rect.width + 2, rect.y + rect.height);
+    dc.DrawLine(rect.x + rect.width + 1, rect.y,
+                rect.x + rect.width + 1, rect.y + rect.height + 2);
+    dc.DrawLine(rect.x + rect.width + 2, rect.y,
+                rect.x + rect.width + 2, rect.y + rect.height + 2);

     // Top
     // Top

-    dc.DrawLine(rect.x + rect.width + 2, rect.y + rect.height + 2,
-                rect.x - 2, rect.y + rect.height + 2);
-    dc.DrawLine(rect.x + rect.width + 1, rect.y + rect.height + 1,
-                rect.x - 2, rect.y + rect.height + 1);
+    dc.DrawLine(rect.x + rect.width + 2, rect.y,
+                rect.x - 2, rect.y);
+    dc.DrawLine(rect.x + rect.width + 1, rect.y - 1,
+                rect.x - 2, rect.y - 1);

     dc.SetPen(m_hilightPen);
     dc.SetPen(m_hilightPen);

-    dc.DrawLine(rect.x + rect.width, rect.y + rect.height,
-                rect.x - 2, rect.y + rect.height);
+    dc.DrawLine(rect.x + rect.width, rect.y - 2,
+                rect.x - 2, rect.y - 2);

 
 #endif
 
 
 #endif
 


@@ -405,4 +395,4 @@ void wxStatusBarGeneric::SetMinHeight(int height)
     }
 }
 
     }
 }
 

-//#endif // Win32 && wxUSE_NATIVE_STATUSBAR
+#endif // wxUSE_STATUSBAR