From: Paul Cornett <paulcor@bullseye.com>
Date: Tue, 20 Nov 2007 16:55:36 +0000 (+0000)
Subject: build fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/915bd4e484157cfe1ed2a66f58cb9a5aa251a4b7

build fixes

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 3becd7bb5c..5d751165ec 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -337,7 +337,7 @@ protected:
     // common part of all ctors (not virtual because called from ctor)
     void Init();
 
-    virtual void DoMoveInTabOrder(wxWindow *win, MoveKind move);
+    virtual void DoMoveInTabOrder(wxWindow *win, WindowOrder move);
     virtual bool DoNavigateIn(int flags);
 
 
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 32c3e8c581..3a7a7bbdbb 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -5021,6 +5021,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
 
     m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style );
 
+#ifdef __WXMAC__
     // Human Interface Guidelines ask us for a special font in this case
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {
@@ -5028,11 +5029,13 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
         font.MacCreateThemeFont( kThemeViewsFont );
         SetFont( font );
     }
+#endif
 
     if ( InReportView() )
     {
         CreateHeaderWindow();
 
+#ifdef __WXMAC__
         if (m_headerWin)
         {
             wxFont font;
@@ -5040,6 +5043,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
             m_headerWin->SetFont( font );
             CalculateAndSetHeaderHeight();
         }
+#endif
 
         if ( HasFlag(wxLC_NO_HEADER) )
             // VZ: why do we create it at all then?
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index bd82beb7e6..8f71b6e2ec 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3278,7 +3278,7 @@ wxWindowGTK::AdjustForLayoutDirection(wxCoord x,
     return x;
 }
 
-void wxWindowGTK::DoMoveInTabOrder(wxWindow *win, MoveKind move)
+void wxWindowGTK::DoMoveInTabOrder(wxWindow *win, WindowOrder move)
 {
     wxWindowBase::DoMoveInTabOrder(win, move);
     m_dirtyTabOrder = true;
diff --git a/src/mac/carbon/databrow.cpp b/src/mac/carbon/databrow.cpp
index f1015a1403..930effca50 100644
--- a/src/mac/carbon/databrow.cpp
+++ b/src/mac/carbon/databrow.cpp
@@ -19,6 +19,7 @@
     #include "wx/app.h"
     #include "wx/toplevel.h"
     #include "wx/font.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/dataview.h"