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

diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp
index bf92e5333c9e1578f7572eb3552e5e1675ceab42..3be427a046b1eb0ed9a4a166cbebd068b8f9b3f5 100644 (file)
--- a/samples/widgets/bmpcombobox.cpp
+++ b/samples/widgets/bmpcombobox.cpp
@@ -769,7 +769,7 @@ wxBitmap BitmapComboBoxWidgetsPage::QueryBitmap(wxString* pStr)
                                        wxT(""),
                                        wxT(""),
                                        wxT("*.*"),
                                        wxT(""),
                                        wxT(""),
                                        wxT("*.*"),

-                                       wxOPEN | wxFILE_MUST_EXIST,
+                                       wxFD_OPEN | wxFD_FILE_MUST_EXIST,

                                        this);
 
     wxBitmap bitmap;
                                        this);
 
     wxBitmap bitmap;

diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp
index b21d5e7b09ff5dda6d512b4fe1ed72df6338df46..3fed169c733d4aa45754f85bd19b08c313a573bd 100644 (file)
--- a/src/richtext/richtextformatdlg.cpp
+++ b/src/richtext/richtextformatdlg.cpp
@@ -18,6 +18,8 @@
 
 #if wxUSE_RICHTEXT
 
 
 #if wxUSE_RICHTEXT
 

+#include "wx/richtext/richtextformatdlg.h"
+

 #ifndef WX_PRECOMP
     #include "wx/listbox.h"
     #include "wx/combobox.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/module.h"
 #include "wx/imaglist.h"
 

-#include "wx/richtext/richtextformatdlg.h"

 #include "wx/richtext/richtextctrl.h"
 #include "wx/richtext/richtextstyles.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,
     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);
     );
 
     GetFormattingDialogFactory()->CreateButtons(this);