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

@@ -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;

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);