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

Fix warnings about wxOSX_USE_CARBON being undefined when using g++.

Browse Source 
Test for __WXMAC__ before testing wxOSX_USE_CARBON to avoid -Wundef warnings
from g++ in non-Mac builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-10-10 17:12:42 +00:00
parent 3648be1f8f
commit 7652eada41
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/popupwin.h
View File

@@ -134,7 +134,7 @@ protected:
// wxOSX/Carbon doesn't generate mouse capture loss events currently so // wxOSX/Carbon doesn't generate mouse capture loss events currently so
// poll for the capture loss ourselves. // poll for the capture loss ourselves.
#if wxOSX_USE_CARBON #if defined(__WXMAC__) && wxOSX_USE_CARBON
// check if the mouse needs captured or released // check if the mouse needs captured or released
void OnIdle(wxIdleEvent& event); void OnIdle(wxIdleEvent& event);
#endif #endif

4
src/common/popupcmn.cpp
View File

@@ -116,7 +116,7 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
END_EVENT_TABLE() END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow) BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
#if wxOSX_USE_CARBON #if defined(__WXMAC__) && wxOSX_USE_CARBON
EVT_IDLE(wxPopupTransientWindow::OnIdle) EVT_IDLE(wxPopupTransientWindow::OnIdle)
#endif #endif
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -426,7 +426,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
return false; return false;
} }
#if wxOSX_USE_CARBON #if defined(__WXMAC__) && wxOSX_USE_CARBON
void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
{ {
event.Skip(); event.Skip();