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 3becd7bb5c01ed8b2efb05c309f55d6e63afc8c7..5d751165ecf24b8643141ef35c6bb9bdf45f4856 100644 (file)
--- 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();
 
     // 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);
 
 
     virtual bool DoNavigateIn(int flags);
 
 

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 32c3e8c581c5280eebf8001630e84996f57fc7ef..3a7a7bbdbbf2482dc0f2db1fdfcfa20e8f68d9a8 100644 (file)
--- 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 );
 
 
     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 )
     {
     // 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 );
     }
         font.MacCreateThemeFont( kThemeViewsFont );
         SetFont( font );
     }

+#endif

 
     if ( InReportView() )
     {
         CreateHeaderWindow();
 
 
     if ( InReportView() )
     {
         CreateHeaderWindow();
 

+#ifdef __WXMAC__

         if (m_headerWin)
         {
             wxFont font;
         if (m_headerWin)
         {
             wxFont font;


@@ -5040,6 +5043,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
             m_headerWin->SetFont( font );
             CalculateAndSetHeaderHeight();
         }
             m_headerWin->SetFont( font );
             CalculateAndSetHeaderHeight();
         }

+#endif

 
         if ( HasFlag(wxLC_NO_HEADER) )
             // VZ: why do we create it at all then?
 
         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 bd82beb7e69af1ddc20e800b26a0e4b5a36b6647..8f71b6e2eca09a81bb7cce98dc312b9783d014f0 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3278,7 +3278,7 @@ wxWindowGTK::AdjustForLayoutDirection(wxCoord x,
     return x;
 }
 
     return x;
 }
 

-void wxWindowGTK::DoMoveInTabOrder(wxWindow *win, MoveKind move)
+void wxWindowGTK::DoMoveInTabOrder(wxWindow *win, WindowOrder move)

 {
     wxWindowBase::DoMoveInTabOrder(win, move);
     m_dirtyTabOrder = true;
 {
     wxWindowBase::DoMoveInTabOrder(win, move);
     m_dirtyTabOrder = true;

diff --git a/src/mac/carbon/databrow.cpp b/src/mac/carbon/databrow.cpp
index f1015a1403518e67a1823f43f98d642e44dd9c32..930effca507dcbeef5ab666f64d744ec2914bc92 100644 (file)
--- 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/app.h"
     #include "wx/toplevel.h"
     #include "wx/font.h"

+    #include "wx/settings.h"

 #endif
 
 #include "wx/dataview.h"
 #endif
 
 #include "wx/dataview.h"