From 528e5cf81ada15924627bf1cf3e621a67b83d5b3 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Mon, 9 Oct 2006 07:35:36 +0000 Subject: [PATCH] build fixes for WXWIN_COMPATIBILITY_2_6=0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/widgets/bmpcombobox.cpp | 2 +- src/richtext/richtextformatdlg.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp index bf92e53..3be427a 100644 --- a/samples/widgets/bmpcombobox.cpp +++ b/samples/widgets/bmpcombobox.cpp @@ -769,7 +769,7 @@ wxBitmap BitmapComboBoxWidgetsPage::QueryBitmap(wxString* pStr) wxT(""), wxT(""), wxT("*.*"), - wxOPEN | wxFILE_MUST_EXIST, + wxFD_OPEN | wxFD_FILE_MUST_EXIST, this); wxBitmap bitmap; diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp index b21d5e7..3fed169 100644 --- a/src/richtext/richtextformatdlg.cpp +++ b/src/richtext/richtextformatdlg.cpp @@ -18,6 +18,8 @@ #if wxUSE_RICHTEXT +#include "wx/richtext/richtextformatdlg.h" + #ifndef WX_PRECOMP #include "wx/listbox.h" #include "wx/combobox.h" @@ -41,7 +43,6 @@ #include "wx/module.h" #include "wx/imaglist.h" -#include "wx/richtext/richtextformatdlg.h" #include "wx/richtext/richtextctrl.h" #include "wx/richtext/richtextstyles.h" @@ -88,7 +89,7 @@ bool wxRichTextFormattingDialog::Create(long flags, wxWindow* parent, const wxSt GetFormattingDialogFactory()->SetSheetStyle(this); wxPropertySheetDialog::Create(parent, id, title, pos, sz, - style | (int)wxPlatform::IfNot(wxWinCE, resizeBorder) + style | (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, resizeBorder) ); GetFormattingDialogFactory()->CreateButtons(this); -- 2.7.4