From: Robin Dunn Date: Sun, 25 Sep 2011 04:30:49 +0000 (+0000) Subject: Fix missing or broken interface items for Phoenix X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6e350141f124f383654fd1337314fc9f55f95cbf Fix missing or broken interface items for Phoenix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/interface/wx/app.h b/interface/wx/app.h index 76b0d53845..c17ad1c002 100644 --- a/interface/wx/app.h +++ b/interface/wx/app.h @@ -221,6 +221,8 @@ public: //@} + bool Yield(bool onlyIfNeeded = false); + /** Allows external code to modify global ::wxTheApp, but you should really know what you're doing if you call it. @@ -250,7 +252,6 @@ public: */ static bool IsMainLoopRunning(); - /** @name Callbacks for application-wide "events" */ diff --git a/interface/wx/dcgraph.h b/interface/wx/dcgraph.h index cd6a5ea3a3..0683c3a1fc 100644 --- a/interface/wx/dcgraph.h +++ b/interface/wx/dcgraph.h @@ -23,17 +23,17 @@ public: /** Constructs a wxGCDC from a wxWindowDC. */ - wxGCDC( const wxWindowDC& dc ); + wxGCDC( const wxWindowDC& windowDC ); /** Constructs a wxGCDC from a wxMemoryDC. */ - wxGCDC( const wxMemoryDC& dc ); + wxGCDC( const wxMemoryDC& memoryDC ); /** Constructs a wxGCDC from a wxPrinterDC. */ - wxGCDC( const wxPrinterDC& dc ); + wxGCDC( const wxPrinterDC& printerDC ); /** Construct a wxGCDC from an existing grtaphics context. @@ -49,10 +49,11 @@ public: @since 2.9.3 */ - wxGCDC( const wxEnhMetaFileDC& dc ); + wxGCDC( const wxEnhMetaFileDC& emfDC ); wxGCDC(); virtual ~wxGCDC(); + /** Retrieves associated wxGraphicsContext */ diff --git a/interface/wx/dialog.h b/interface/wx/dialog.h index 994b7d36c7..6128928032 100644 --- a/interface/wx/dialog.h +++ b/interface/wx/dialog.h @@ -673,3 +673,13 @@ public: virtual bool DoLayoutAdaptation(wxDialog* dialog) = 0; }; + +class wxWindowModalDialogEvent : public wxCommandEvent +{ +public: + wxWindowModalDialogEvent (wxEventType commandType = wxEVT_NULL, int id = 0); + + wxDialog *GetDialog() const; + int GetReturnCode() const; + virtual wxEvent *Clone() const; +}; diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h index 7425c4a78a..17af72a97d 100644 --- a/interface/wx/graphics.h +++ b/interface/wx/graphics.h @@ -116,12 +116,12 @@ public: @return @true if the point is within the path. */ bool Contains(const wxPoint2DDouble& c, - int fillStyle = wxODDEVEN_RULE) const; + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const; /** @return @true if the point is within the path. */ virtual bool Contains(wxDouble x, wxDouble y, - int fillStyle = wxODDEVEN_RULE) const; + wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const; /** Gets the bounding box enclosing all points (possibly including control diff --git a/interface/wx/timer.h b/interface/wx/timer.h index e74e836b92..07fbccff35 100644 --- a/interface/wx/timer.h +++ b/interface/wx/timer.h @@ -6,6 +6,15 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// generate notifications periodically until the timer is stopped (default) +#define wxTIMER_CONTINUOUS false + +// only send the notification once and then stop the timer +#define wxTIMER_ONE_SHOT true + +wxEventType wxEVT_TIMER; + + /** @class wxTimer @@ -131,6 +140,19 @@ public: }; +/** + @class wxTimerRunner + + Starts the timer in its ctor, stops in the dtor. +*/ +class wxTimerRunner +{ +public: + wxTimerRunner(wxTimer& timer); + wxTimerRunner(wxTimer& timer, int milli, bool oneShot = false); + void Start(int milli, bool oneShot = false); + ~wxTimerRunner(); +}; /** @class wxTimerEvent