From c657294b529b8bbef4fb3263f0c7e53dd368f802 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 15 Jun 2012 16:24:09 +0000
Subject: [PATCH] better naming wxCFEventLoopPauseIdleEvents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/osx/evtloop.h | 10 +++++-----
src/osx/cocoa/msgdlg.mm | 2 +-
src/osx/core/evtloop_cf.cpp | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/wx/osx/evtloop.h b/include/wx/osx/evtloop.h
index d33e44d2c3..efbb220918 100644
--- a/include/wx/osx/evtloop.h
+++ b/include/wx/osx/evtloop.h
@@ -17,11 +17,11 @@
DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoop );
DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopObserver );
-class WXDLLIMPEXP_BASE wxCFEventLoopPauseObservers;
+class WXDLLIMPEXP_BASE wxCFEventLoopPauseIdleEvents;
class WXDLLIMPEXP_BASE wxCFEventLoop : public wxEventLoopBase
{
- friend class wxCFEventLoopPauseObservers;
+ friend class wxCFEventLoopPauseIdleEvents;
public:
wxCFEventLoop();
virtual ~wxCFEventLoop();
@@ -103,11 +103,11 @@ private:
wxDECLARE_NO_COPY_CLASS(wxCFEventLoop);
};
-class WXDLLIMPEXP_BASE wxCFEventLoopPauseObservers : public wxObject
+class WXDLLIMPEXP_BASE wxCFEventLoopPauseIdleEvents : public wxObject
{
public:
- wxCFEventLoopPauseObservers();
- virtual ~wxCFEventLoopPauseObservers();
+ wxCFEventLoopPauseIdleEvents();
+ virtual ~wxCFEventLoopPauseIdleEvents();
};
#if wxUSE_GUI
diff --git a/src/osx/cocoa/msgdlg.mm b/src/osx/cocoa/msgdlg.mm
index 82a5c4b907..9e4ab729f1 100644
--- a/src/osx/cocoa/msgdlg.mm
+++ b/src/osx/cocoa/msgdlg.mm
@@ -62,7 +62,7 @@ wxMessageDialog::~wxMessageDialog()
int wxMessageDialog::ShowModal()
{
- wxCFEventLoopPauseObservers pause;
+ wxCFEventLoopPauseIdleEvents pause;
int resultbutton = wxID_CANCEL;
diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index 0c98ae3fea..5e43bb697e 100644
--- a/src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp
@@ -441,14 +441,14 @@ void wxCFEventLoop::Exit(int rc)
DoStop();
}
-wxCFEventLoopPauseObservers::wxCFEventLoopPauseObservers()
+wxCFEventLoopPauseIdleEvents::wxCFEventLoopPauseIdleEvents()
{
wxCFEventLoop* cfl = dynamic_cast<wxCFEventLoop*>(wxEventLoopBase::GetActive());
if ( cfl )
cfl->SetProcessIdleEvents(false);
}
-wxCFEventLoopPauseObservers::~wxCFEventLoopPauseObservers()
+wxCFEventLoopPauseIdleEvents::~wxCFEventLoopPauseIdleEvents()
{
wxCFEventLoop* cfl = dynamic_cast<wxCFEventLoop*>(wxEventLoopBase::GetActive());
if ( cfl )
--
2.47.2