Blind fixes for warnings in wxTinderbox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
78f9336500
commit
23ff76d5ad
@ -66,6 +66,7 @@ class WXDLLEXPORT wxComboPopup
|
||||
{
|
||||
public:
|
||||
wxComboPopup(wxComboControl *combo) { m_combo = combo; }
|
||||
virtual ~wxComboPopup() {}
|
||||
|
||||
// we must have an associated control which is subclassed by the combobox
|
||||
virtual wxControl *GetControl() = 0;
|
||||
|
@ -31,7 +31,7 @@ typedef wxString wxControlAction;
|
||||
#define wxACTION_NONE _T("") // no action to perform
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxInputConsumer: mix-in class for handling wxControlActions (used by
|
||||
// wxInputConsumer: mix-in class for handling wxControlActions (used by
|
||||
// wxControl and wxTopLevelWindow).
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
@ -39,6 +39,7 @@ class WXDLLEXPORT wxInputConsumer
|
||||
{
|
||||
public:
|
||||
wxInputConsumer() { m_inputHandler = NULL; }
|
||||
virtual ~wxInputConsumer() {}
|
||||
|
||||
// get the input handler
|
||||
wxInputHandler *GetInputHandler() const { return m_inputHandler; }
|
||||
@ -98,18 +99,18 @@ private:
|
||||
EVT_SET_FOCUS(classname::OnFocus) \
|
||||
EVT_KILL_FOCUS(classname::OnFocus) \
|
||||
EVT_ACTIVATE(classname::OnActivate)
|
||||
|
||||
|
||||
// Forward event handlers to wxInputConsumer
|
||||
//
|
||||
// (We can't use them directly, because wxIC has virtual methods, which forces
|
||||
// the compiler to include (at least) two vtables into wxControl, one for the
|
||||
// wxWindow-wxControlBase-wxControl branch and one for the wxIC mix-in.
|
||||
// Consequently, the "this" pointer has different value when in wxControl's
|
||||
// and wxIC's method, even though the instance stays same. This doesn't matter
|
||||
// so far as member pointers aren't used, but that's not wxControl's case.
|
||||
// When we add an event table entry (= use a member pointer) pointing to
|
||||
// wxIC's OnXXX method, GCC compiles code that executes wxIC::OnXXX with the
|
||||
// version of "this" that belongs to wxControl, not wxIC! In our particular
|
||||
// (We can't use them directly, because wxIC has virtual methods, which forces
|
||||
// the compiler to include (at least) two vtables into wxControl, one for the
|
||||
// wxWindow-wxControlBase-wxControl branch and one for the wxIC mix-in.
|
||||
// Consequently, the "this" pointer has different value when in wxControl's
|
||||
// and wxIC's method, even though the instance stays same. This doesn't matter
|
||||
// so far as member pointers aren't used, but that's not wxControl's case.
|
||||
// When we add an event table entry (= use a member pointer) pointing to
|
||||
// wxIC's OnXXX method, GCC compiles code that executes wxIC::OnXXX with the
|
||||
// version of "this" that belongs to wxControl, not wxIC! In our particular
|
||||
// case, the effect is that m_handler is NULL (probably same memory
|
||||
// area as the_other_vtable's_this->m_refObj) and input handling doesn't work.)
|
||||
#define WX_FORWARD_TO_INPUT_CONSUMER(classname) \
|
||||
|
@ -81,6 +81,8 @@ private:
|
||||
class WXDLLEXPORT wxControlWithArrows
|
||||
{
|
||||
public:
|
||||
virtual ~wxControlWithArrows() {}
|
||||
|
||||
// get the renderer to use for drawing the arrows
|
||||
virtual wxRenderer *GetRenderer() const = 0;
|
||||
|
||||
|
@ -86,6 +86,8 @@ private:
|
||||
class WXDLLEXPORT wxControlWithThumb
|
||||
{
|
||||
public:
|
||||
virtual ~wxControlWithThumb() {}
|
||||
|
||||
// simple accessors
|
||||
// ----------------
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user