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

build fixes for WXWIN_COMPATIBILITY_2_6=0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-10-09 07:35:36 +00:00
parent 61338568b2
commit 528e5cf81a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/widgets/bmpcombobox.cpp
View File

@@ -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); this);
wxBitmap bitmap; wxBitmap bitmap;

5
src/richtext/richtextformatdlg.cpp
View File

@@ -18,6 +18,8 @@
#if wxUSE_RICHTEXT #if wxUSE_RICHTEXT
#include "wx/richtext/richtextformatdlg.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/listbox.h" #include "wx/listbox.h"
#include "wx/combobox.h" #include "wx/combobox.h"
@@ -41,7 +43,6 @@
#include "wx/module.h" #include "wx/module.h"
#include "wx/imaglist.h" #include "wx/imaglist.h"
#include "wx/richtext/richtextformatdlg.h"
#include "wx/richtext/richtextctrl.h" #include "wx/richtext/richtextctrl.h"
#include "wx/richtext/richtextstyles.h" #include "wx/richtext/richtextstyles.h"
@@ -88,7 +89,7 @@ bool wxRichTextFormattingDialog::Create(long flags, wxWindow* parent, const wxSt
GetFormattingDialogFactory()->SetSheetStyle(this); GetFormattingDialogFactory()->SetSheetStyle(this);
wxPropertySheetDialog::Create(parent, id, title, pos, sz, 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);