non virtual dtors warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -23,13 +23,15 @@ class wxCocoaNSButton
|
|||||||
WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSButton);
|
WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSButton);
|
||||||
public:
|
public:
|
||||||
void AssociateNSButton(WX_NSButton cocoaNSButton);
|
void AssociateNSButton(WX_NSButton cocoaNSButton);
|
||||||
inline void DisassociateNSButton(WX_NSButton cocoaNSButton)
|
void DisassociateNSButton(WX_NSButton cocoaNSButton)
|
||||||
{
|
{
|
||||||
if(cocoaNSButton)
|
if(cocoaNSButton)
|
||||||
sm_cocoaHash.erase(cocoaNSButton);
|
sm_cocoaHash.erase(cocoaNSButton);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void Cocoa_wxNSButtonAction(void) = 0;
|
virtual void Cocoa_wxNSButtonAction(void) = 0;
|
||||||
|
virtual ~wxCocoaNSButton() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static const wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaTarget;
|
static const wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaTarget;
|
||||||
};
|
};
|
||||||
|
@@ -22,6 +22,9 @@ class wxCocoaNSControl
|
|||||||
public:
|
public:
|
||||||
virtual void CocoaTarget_action() {}
|
virtual void CocoaTarget_action() {}
|
||||||
// virtual void Cocoa_didChangeText(void) = 0;
|
// virtual void Cocoa_didChangeText(void) = 0;
|
||||||
|
|
||||||
|
virtual ~wxCocoaNSControl() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static struct objc_object *sm_cocoaTarget;
|
static struct objc_object *sm_cocoaTarget;
|
||||||
};
|
};
|
||||||
|
@@ -40,6 +40,8 @@ public:
|
|||||||
virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification notification) {}
|
virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification notification) {}
|
||||||
virtual void CocoaNotification_menuDidSendAction(WX_NSNotification notification) {}
|
virtual void CocoaNotification_menuDidSendAction(WX_NSNotification notification) {}
|
||||||
virtual void CocoaNotification_menuWillSendAction(WX_NSNotification notification) {}
|
virtual void CocoaNotification_menuWillSendAction(WX_NSNotification notification) {}
|
||||||
|
virtual ~wxCocoaNSMenu() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static struct objc_object *sm_cocoaObserver;
|
static struct objc_object *sm_cocoaObserver;
|
||||||
};
|
};
|
||||||
|
@@ -25,13 +25,15 @@ class wxCocoaNSScroller
|
|||||||
WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSScroller);
|
WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSScroller);
|
||||||
public:
|
public:
|
||||||
void AssociateNSScroller(WX_NSScroller cocoaNSScroller);
|
void AssociateNSScroller(WX_NSScroller cocoaNSScroller);
|
||||||
inline void DisassociateNSScroller(WX_NSScroller cocoaNSScroller)
|
void DisassociateNSScroller(WX_NSScroller cocoaNSScroller)
|
||||||
{
|
{
|
||||||
if(cocoaNSScroller)
|
if(cocoaNSScroller)
|
||||||
sm_cocoaHash.erase(cocoaNSScroller);
|
sm_cocoaHash.erase(cocoaNSScroller);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void Cocoa_wxNSScrollerAction(void) = 0;
|
virtual void Cocoa_wxNSScrollerAction(void) = 0;
|
||||||
|
virtual ~wxCocoaNSScroller() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static const wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaTarget;
|
static const wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaTarget;
|
||||||
};
|
};
|
||||||
|
@@ -27,6 +27,8 @@ public:
|
|||||||
void DisassociateNSTabView(WX_NSTabView ocoaNSTabView);
|
void DisassociateNSTabView(WX_NSTabView ocoaNSTabView);
|
||||||
virtual void CocoaDelegate_tabView_didSelectTabViewItem(WX_NSTabViewItem tabviewItem) = 0;
|
virtual void CocoaDelegate_tabView_didSelectTabViewItem(WX_NSTabViewItem tabviewItem) = 0;
|
||||||
virtual bool CocoaDelegate_tabView_shouldSelectTabViewItem(WX_NSTabViewItem tabviewItem) = 0;
|
virtual bool CocoaDelegate_tabView_shouldSelectTabViewItem(WX_NSTabViewItem tabviewItem) = 0;
|
||||||
|
virtual ~wxCocoaNSTabView() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaDelegate;
|
static wxObjcAutoRefFromAlloc<struct objc_object*> sm_cocoaDelegate;
|
||||||
};
|
};
|
||||||
|
@@ -24,6 +24,7 @@ public:
|
|||||||
virtual int CocoaDataSource_numberOfRows() = 0;
|
virtual int CocoaDataSource_numberOfRows() = 0;
|
||||||
virtual struct objc_object* CocoaDataSource_objectForTableColumn(
|
virtual struct objc_object* CocoaDataSource_objectForTableColumn(
|
||||||
WX_NSTableColumn tableColumn, int rowIndex) = 0;
|
WX_NSTableColumn tableColumn, int rowIndex) = 0;
|
||||||
|
virtual ~wxCocoaNSTableView() { }
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _WX_COCOA_NSTABLEVIEW_H_
|
#endif // _WX_COCOA_NSTABLEVIEW_H_
|
||||||
|
@@ -21,6 +21,7 @@ class wxCocoaNSTextField
|
|||||||
WX_DECLARE_OBJC_INTERFACE(NSTextField)
|
WX_DECLARE_OBJC_INTERFACE(NSTextField)
|
||||||
protected:
|
protected:
|
||||||
virtual void Cocoa_didChangeText(void) = 0;
|
virtual void Cocoa_didChangeText(void) = 0;
|
||||||
|
virtual ~wxCocoaNSTextField() { }
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _WX_COCOA_NSTEXTFIELD_H_
|
#endif // _WX_COCOA_NSTEXTFIELD_H_
|
||||||
|
@@ -62,6 +62,7 @@ public:
|
|||||||
{ return false; }
|
{ return false; }
|
||||||
virtual bool Cocoa_resetCursorRects()
|
virtual bool Cocoa_resetCursorRects()
|
||||||
{ return false; }
|
{ return false; }
|
||||||
|
virtual ~wxCocoaNSView() { }
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _WX_COCOA_NSVIEW_H_
|
#endif // _WX_COCOA_NSVIEW_H_
|
||||||
|
@@ -28,6 +28,7 @@ public:
|
|||||||
void DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox);
|
void DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox);
|
||||||
|
|
||||||
virtual void doWxEvent(int nEvent) = 0;
|
virtual void doWxEvent(int nEvent) = 0;
|
||||||
|
virtual ~wxCocoaNSComboBox() { }
|
||||||
};
|
};
|
||||||
|
|
||||||
//begin combobox.h
|
//begin combobox.h
|
||||||
|
Reference in New Issue
Block a user