Check for socklen_t type using C++ mode (since gsocket.cpp is now C++ code).

[wxWidgets.git] / src / common / buttoncmn.cpp

diff --git a/src/common/buttoncmn.cpp b/src/common/buttoncmn.cpp
index 0e767dd00618b52994a70934cbc2995da1809a5a..7c270e56af1676b5dea0bbc7728ef3d4fbde9b85 100644 (file)
--- a/src/common/buttoncmn.cpp
+++ b/src/common/buttoncmn.cpp
@@ -32,7 +32,7 @@
 
 #include "wx/button.h"
 
-#ifndef __WXGTK20__
+#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
 bool wxButtonBase::CreateStock(wxWindow *parent,
                                wxWindowID id,
                                wxStockItemID stock,
@@ -43,7 +43,9 @@ bool wxButtonBase::CreateStock(wxWindow *parent,
                                const wxString& name)
 {
     wxString label;
-#if defined(__WXMAC__) || defined(__WXCOCOA__)
+#if !defined(__WXMAC__) && !defined(__WXCOCOA__)
+    wxUnusedVar(descriptiveLabel);
+#else // defined(__WXMAC__) || defined(__WXCOCOA__)
     if (!descriptiveLabel.empty())
     {
         label = descriptiveLabel;