Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-11-20 16:55:36 +00:00
parent 9553702e46
commit 915bd4e484
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/window.h
View File

@@ -337,7 +337,7 @@ protected:
// common part of all ctors (not virtual because called from ctor) // common part of all ctors (not virtual because called from ctor)
void Init(); 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);

4
src/generic/listctrl.cpp
View File

@@ -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 // Human Interface Guidelines ask us for a special font in this case
if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ) if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
{ {
@@ -5028,11 +5029,13 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
font.MacCreateThemeFont( kThemeViewsFont ); font.MacCreateThemeFont( kThemeViewsFont );
SetFont( font ); SetFont( font );
} }
#endif
if ( InReportView() ) if ( InReportView() )
{ {
CreateHeaderWindow(); CreateHeaderWindow();
#ifdef __WXMAC__
if (m_headerWin) if (m_headerWin)
{ {
wxFont font; wxFont font;
@@ -5040,6 +5043,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
m_headerWin->SetFont( font ); m_headerWin->SetFont( font );
CalculateAndSetHeaderHeight(); CalculateAndSetHeaderHeight();
} }
#endif
if ( HasFlag(wxLC_NO_HEADER) ) if ( HasFlag(wxLC_NO_HEADER) )
// VZ: why do we create it at all then? // VZ: why do we create it at all then?

2
src/gtk/window.cpp
View File

@@ -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); wxWindowBase::DoMoveInTabOrder(win, move);
m_dirtyTabOrder = true; m_dirtyTabOrder = true;

1
src/mac/carbon/databrow.cpp
View File

@@ -19,6 +19,7 @@
#include "wx/app.h" #include "wx/app.h"
#include "wx/toplevel.h" #include "wx/toplevel.h"
#include "wx/font.h" #include "wx/font.h"
#include "wx/settings.h"
#endif #endif
#include "wx/dataview.h" #include "wx/dataview.h"