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

wxUniv compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-08-18 22:27:42 +00:00
parent 30a936ee4e
commit 853bbd9e35
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/button.h
View File

@@ -82,7 +82,7 @@ public:
static wxSize GetDefaultSize(); static wxSize GetDefaultSize();
protected: protected:
#ifndef __WXGTK20__ #if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
// create stock button (generic implementation) // create stock button (generic implementation)
bool CreateStock(wxWindow *parent, wxWindowID id, wxStockItemID stock, bool CreateStock(wxWindow *parent, wxWindowID id, wxStockItemID stock,
const wxString& descriptiveLabel = wxEmptyString, const wxString& descriptiveLabel = wxEmptyString,

2
src/common/buttoncmn.cpp
View File

@@ -32,7 +32,7 @@
#include "wx/button.h" #include "wx/button.h"
#ifndef __WXGTK20__ #if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
bool wxButtonBase::CreateStock(wxWindow *parent, bool wxButtonBase::CreateStock(wxWindow *parent,
wxWindowID id, wxWindowID id,
wxStockItemID stock, wxStockItemID stock,

2
src/generic/colrdlgg.cpp
View File

@@ -20,7 +20,7 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_COLOURDLG && !defined(__WXGTK20__) #if wxUSE_COLOURDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__))
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/utils.h" #include "wx/utils.h"

2
src/generic/msgdlgg.cpp
View File

@@ -20,7 +20,7 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXGPE__)) #if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__) || defined(__WXGPE__))
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/utils.h" #include "wx/utils.h"