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
This commit is contained in:
Robin Dunn
2011-09-25 04:30:49 +00:00
parent 87d2c6f507
commit 6e350141f1
5 changed files with 41 additions and 7 deletions

View File

@@ -221,6 +221,8 @@ public:
//@} //@}
bool Yield(bool onlyIfNeeded = false);
/** /**
Allows external code to modify global ::wxTheApp, but you should really Allows external code to modify global ::wxTheApp, but you should really
know what you're doing if you call it. know what you're doing if you call it.
@@ -250,7 +252,6 @@ public:
*/ */
static bool IsMainLoopRunning(); static bool IsMainLoopRunning();
/** /**
@name Callbacks for application-wide "events" @name Callbacks for application-wide "events"
*/ */

View File

@@ -23,17 +23,17 @@ public:
/** /**
Constructs a wxGCDC from a wxWindowDC. Constructs a wxGCDC from a wxWindowDC.
*/ */
wxGCDC( const wxWindowDC& dc ); wxGCDC( const wxWindowDC& windowDC );
/** /**
Constructs a wxGCDC from a wxMemoryDC. Constructs a wxGCDC from a wxMemoryDC.
*/ */
wxGCDC( const wxMemoryDC& dc ); wxGCDC( const wxMemoryDC& memoryDC );
/** /**
Constructs a wxGCDC from a wxPrinterDC. Constructs a wxGCDC from a wxPrinterDC.
*/ */
wxGCDC( const wxPrinterDC& dc ); wxGCDC( const wxPrinterDC& printerDC );
/** /**
Construct a wxGCDC from an existing grtaphics context. Construct a wxGCDC from an existing grtaphics context.
@@ -49,10 +49,11 @@ public:
@since 2.9.3 @since 2.9.3
*/ */
wxGCDC( const wxEnhMetaFileDC& dc ); wxGCDC( const wxEnhMetaFileDC& emfDC );
wxGCDC(); wxGCDC();
virtual ~wxGCDC(); virtual ~wxGCDC();
/** /**
Retrieves associated wxGraphicsContext Retrieves associated wxGraphicsContext
*/ */

View File

@@ -673,3 +673,13 @@ public:
virtual bool DoLayoutAdaptation(wxDialog* dialog) = 0; 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;
};

View File

@@ -116,12 +116,12 @@ public:
@return @true if the point is within the path. @return @true if the point is within the path.
*/ */
bool Contains(const wxPoint2DDouble& c, bool Contains(const wxPoint2DDouble& c,
int fillStyle = wxODDEVEN_RULE) const; wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const;
/** /**
@return @true if the point is within the path. @return @true if the point is within the path.
*/ */
virtual bool Contains(wxDouble x, wxDouble y, 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 Gets the bounding box enclosing all points (possibly including control

View File

@@ -6,6 +6,15 @@
// Licence: wxWindows licence // 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 @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 @class wxTimerEvent