Made db.h compile (removed this wxODBC_ONLY_FARWRD_XXXXXX),

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 683752e0b15970d289ffba2bf8053dae81ce68cf..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


@@ -87,8 +83,9 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID id,
   bool success = wxWindow::Create(parent, id, pos, size, style | wxTAB_TRAVERSAL, name);
 
   // Don't wish this to be found as a child
   bool success = wxWindow::Create(parent, id, pos, size, style | wxTAB_TRAVERSAL, name);
 
   // 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);


@@ -200,7 +197,7 @@ 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) ;
   

-#ifdef __WXGTK__
+#if defined( __WXGTK__ ) || defined(__WXMAC__)

   xpos++;
   ypos++;
 #endif
   xpos++;
   ypos++;
 #endif