wxUniv compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
30a936ee4e
commit
853bbd9e35
@ -82,7 +82,7 @@ public:
|
||||
static wxSize GetDefaultSize();
|
||||
|
||||
protected:
|
||||
#ifndef __WXGTK20__
|
||||
#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
|
||||
// create stock button (generic implementation)
|
||||
bool CreateStock(wxWindow *parent, wxWindowID id, wxStockItemID stock,
|
||||
const wxString& descriptiveLabel = wxEmptyString,
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
#include "wx/button.h"
|
||||
|
||||
#ifndef __WXGTK20__
|
||||
#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
|
||||
bool wxButtonBase::CreateStock(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
wxStockItemID stock,
|
||||
|
@ -20,7 +20,7 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_COLOURDLG && !defined(__WXGTK20__)
|
||||
#if wxUSE_COLOURDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__))
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/utils.h"
|
||||
|
@ -20,7 +20,7 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXGPE__))
|
||||
#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__) || defined(__WXGPE__))
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/utils.h"
|
||||
|
Loading…
Reference in New Issue
Block a user