Moving y pos transofrmation code to wxOS2::wxDC elimiantes need for some #ifdef __WXP...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 386ba1d251c77f956372c99e278ed234597ca00e..ea7ab8837a2eb7b06381bb7aa09df932a7d68556 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -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++;