wxUniv compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/button.h b/include/wx/button.h
index 1143afed78d5a04759a388c9100b2774ca1003a1..3ddac2830eeab9e9e47a1302cffcd0b88ee337a6 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -82,7 +82,7 @@ public:
     static wxSize GetDefaultSize();
 
 protected:
     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,
     // create stock button (generic implementation)
     bool CreateStock(wxWindow *parent, wxWindowID id, wxStockItemID stock,
                      const wxString& descriptiveLabel = wxEmptyString,

diff --git a/src/common/buttoncmn.cpp b/src/common/buttoncmn.cpp
index 68769b2234a2c82ad0107b02de57d56c0b6106fe..7c270e56af1676b5dea0bbc7728ef3d4fbde9b85 100644 (file)
--- a/src/common/buttoncmn.cpp
+++ b/src/common/buttoncmn.cpp
@@ -32,7 +32,7 @@
 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

-#ifndef __WXGTK20__
+#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)

 bool wxButtonBase::CreateStock(wxWindow *parent,
                                wxWindowID id,
                                wxStockItemID stock,
 bool wxButtonBase::CreateStock(wxWindow *parent,
                                wxWindowID id,
                                wxStockItemID stock,

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index c77bb505702e863912200ee839c27f6690322756..6aa374457088b1e493a47ffc4e05237cd272f770 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -20,7 +20,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_COLOURDLG && !defined(__WXGTK20__)
+#if wxUSE_COLOURDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__))

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index d8f1bf552477d6459a6ff780bfae91703e359308..041fe3301aa9d43ef850160942a2a283f00d50ad 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -20,7 +20,7 @@
 #pragma hdrstop
 #endif
 
 #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"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"