mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-31 10:09:36 -06:00
wxWidgets3: update to svn r70933
This commit is contained in:
@ -406,6 +406,8 @@ public:
|
||||
//
|
||||
virtual wxDataViewItem GetCurrentItem() const;
|
||||
virtual void SetCurrentItem(const wxDataViewItem& item);
|
||||
virtual wxDataViewColumn *GetCurrentColumn() const;
|
||||
virtual int GetSelectedItemsCount() const;
|
||||
virtual int GetSelections(wxDataViewItemArray& sel) const;
|
||||
virtual bool IsSelected (wxDataViewItem const& item) const;
|
||||
virtual void Select (wxDataViewItem const& item);
|
||||
@ -427,6 +429,8 @@ public:
|
||||
virtual void SetRowHeight(wxDataViewItem const& item, unsigned int height);
|
||||
virtual void OnSize ();
|
||||
|
||||
virtual void StartEditor( const wxDataViewItem & item, unsigned int column );
|
||||
|
||||
//
|
||||
// other methods
|
||||
//
|
||||
|
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 2006-01-12
|
||||
// RCS-ID: $Id: evtloop.h 65680 2010-09-30 11:44:45Z VZ $
|
||||
// RCS-ID: $Id: evtloop.h 68302 2011-07-19 17:56:57Z SC $
|
||||
// Copyright: (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -20,6 +20,8 @@ class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxCFEventLoop
|
||||
public:
|
||||
wxGUIEventLoop();
|
||||
|
||||
virtual void WakeUp();
|
||||
|
||||
protected:
|
||||
virtual int DoDispatchTimeout(unsigned long timeout);
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
// Author: Stefan Csomor
|
||||
// Modified by:
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id: region.h 67254 2011-03-20 00:14:35Z DS $
|
||||
// RCS-ID: $Id: region.h 69459 2011-10-18 21:56:40Z VZ $
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -17,12 +17,13 @@
|
||||
class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine
|
||||
{
|
||||
public:
|
||||
wxRegion() { }
|
||||
wxRegion(long x, long y, long w, long h);
|
||||
wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
|
||||
wxRegion(const wxRect& rect);
|
||||
wxRegion( WXHRGN hRegion );
|
||||
wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
|
||||
wxRegion();
|
||||
#if wxUSE_IMAGE
|
||||
wxRegion(const wxBitmap& bmp)
|
||||
{
|
||||
Union(bmp);
|
||||
@ -32,6 +33,7 @@ public:
|
||||
{
|
||||
Union(bmp, transColour, tolerance);
|
||||
}
|
||||
#endif
|
||||
|
||||
virtual ~wxRegion();
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
// Author: Stefan Csomor
|
||||
// Modified by:
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id: statbmp.h 67280 2011-03-22 14:17:38Z DS $
|
||||
// RCS-ID: $Id: statbmp.h 70165 2011-12-29 14:42:13Z SN $
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -39,8 +39,8 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
|
||||
|
||||
virtual void SetBitmap(const wxBitmap& bitmap);
|
||||
|
||||
virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
|
||||
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
|
||||
virtual void Command(wxCommandEvent& WXUNUSED(event)) {}
|
||||
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}
|
||||
void OnPaint( wxPaintEvent &event ) ;
|
||||
|
||||
wxBitmap GetBitmap() const { return m_bitmap; }
|
||||
|
Reference in New Issue
Block a user