fixing duplicate rti info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -20,7 +20,6 @@
|
|||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#endif //WX_PRECOMP
|
#endif //WX_PRECOMP
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
|
|
||||||
BEGIN_EVENT_TABLE(wxCheckListBox, wxCheckListBoxBase)
|
BEGIN_EVENT_TABLE(wxCheckListBox, wxCheckListBoxBase)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
// WX_IMPLEMENT_COCOA_OWNER(wxCheckListBox,NSButton,NSControl,NSView)
|
// WX_IMPLEMENT_COCOA_OWNER(wxCheckListBox,NSButton,NSControl,NSView)
|
||||||
|
@@ -24,7 +24,7 @@
|
|||||||
#pragma hdrstop
|
#pragma hdrstop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN
|
#if wxUSE_CHECKLISTBOX
|
||||||
|
|
||||||
#include "wx/checklst.h"
|
#include "wx/checklst.h"
|
||||||
|
|
||||||
|
@@ -46,8 +46,6 @@ static void gtk_checklist_toggled(GtkCellRendererToggle * WXUNUSED(renderer),
|
|||||||
// wxCheckListBox
|
// wxCheckListBox
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
|
|
||||||
|
|
||||||
wxCheckListBox::wxCheckListBox() : wxListBox()
|
wxCheckListBox::wxCheckListBox() : wxListBox()
|
||||||
{
|
{
|
||||||
m_hasCheckBoxes = true;
|
m_hasCheckBoxes = true;
|
||||||
|
@@ -22,8 +22,6 @@
|
|||||||
// wxCheckListBox
|
// wxCheckListBox
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
|
|
||||||
|
|
||||||
wxCheckListBox::wxCheckListBox() : wxListBox()
|
wxCheckListBox::wxCheckListBox() : wxListBox()
|
||||||
{
|
{
|
||||||
m_hasCheckBoxes = true;
|
m_hasCheckBoxes = true;
|
||||||
|
@@ -28,8 +28,6 @@
|
|||||||
// implementation
|
// implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// implementation of wxCheckListBox class
|
// implementation of wxCheckListBox class
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -70,65 +70,6 @@ namespace
|
|||||||
// implementation
|
// implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
|
|
||||||
#if wxUSE_EXTENDED_RTTI
|
|
||||||
WX_DEFINE_FLAGS( wxCheckListBoxStyle )
|
|
||||||
|
|
||||||
wxBEGIN_FLAGS( wxCheckListBoxStyle )
|
|
||||||
// new style border flags, we put them first to
|
|
||||||
// use them for streaming out
|
|
||||||
wxFLAGS_MEMBER(wxBORDER_SIMPLE)
|
|
||||||
wxFLAGS_MEMBER(wxBORDER_SUNKEN)
|
|
||||||
wxFLAGS_MEMBER(wxBORDER_DOUBLE)
|
|
||||||
wxFLAGS_MEMBER(wxBORDER_RAISED)
|
|
||||||
wxFLAGS_MEMBER(wxBORDER_STATIC)
|
|
||||||
wxFLAGS_MEMBER(wxBORDER_NONE)
|
|
||||||
|
|
||||||
// old style border flags
|
|
||||||
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
|
|
||||||
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
|
|
||||||
wxFLAGS_MEMBER(wxDOUBLE_BORDER)
|
|
||||||
wxFLAGS_MEMBER(wxRAISED_BORDER)
|
|
||||||
wxFLAGS_MEMBER(wxSTATIC_BORDER)
|
|
||||||
wxFLAGS_MEMBER(wxBORDER)
|
|
||||||
|
|
||||||
// standard window styles
|
|
||||||
wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
|
|
||||||
wxFLAGS_MEMBER(wxCLIP_CHILDREN)
|
|
||||||
wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
|
|
||||||
wxFLAGS_MEMBER(wxWANTS_CHARS)
|
|
||||||
wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
|
|
||||||
wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
|
|
||||||
wxFLAGS_MEMBER(wxVSCROLL)
|
|
||||||
wxFLAGS_MEMBER(wxHSCROLL)
|
|
||||||
|
|
||||||
wxFLAGS_MEMBER(wxLB_SINGLE)
|
|
||||||
wxFLAGS_MEMBER(wxLB_MULTIPLE)
|
|
||||||
wxFLAGS_MEMBER(wxLB_EXTENDED)
|
|
||||||
wxFLAGS_MEMBER(wxLB_HSCROLL)
|
|
||||||
wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
|
|
||||||
wxFLAGS_MEMBER(wxLB_NEEDED_SB)
|
|
||||||
wxFLAGS_MEMBER(wxLB_SORT)
|
|
||||||
wxFLAGS_MEMBER(wxLB_OWNERDRAW)
|
|
||||||
|
|
||||||
wxEND_FLAGS( wxCheckListBoxStyle )
|
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckListBox, wxListBox,"wx/checklst.h")
|
|
||||||
|
|
||||||
wxBEGIN_PROPERTIES_TABLE(wxCheckListBox)
|
|
||||||
wxEVENT_PROPERTY( Toggle , wxEVT_COMMAND_CHECKLISTBOX_TOGGLED , wxCommandEvent )
|
|
||||||
wxPROPERTY_FLAGS( WindowStyle , wxCheckListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , wxLB_OWNERDRAW /*flags*/ , wxT("Helpstring") , wxT("group")) // style
|
|
||||||
wxEND_PROPERTIES_TABLE()
|
|
||||||
|
|
||||||
wxBEGIN_HANDLERS_TABLE(wxCheckListBox)
|
|
||||||
wxEND_HANDLERS_TABLE()
|
|
||||||
|
|
||||||
wxCONSTRUCTOR_4( wxCheckListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
|
|
||||||
|
|
||||||
#else
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// declaration and implementation of wxCheckListBoxItem class
|
// declaration and implementation of wxCheckListBoxItem class
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -36,8 +36,6 @@
|
|||||||
// implementation
|
// implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxControl)
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// implementation of wxCheckListBox class
|
// implementation of wxCheckListBox class
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -56,8 +56,6 @@ static const int CHECK_MARK_WIDTH = 15;
|
|||||||
// implementation
|
// implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// declaration and implementation of wxCheckListBoxItem class
|
// declaration and implementation of wxCheckListBoxItem class
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -24,8 +24,6 @@
|
|||||||
|
|
||||||
#include "wx/osx/private.h"
|
#include "wx/osx/private.h"
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
|
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
|
BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
|
@@ -59,65 +59,6 @@
|
|||||||
// implementation
|
// implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
|
|
||||||
#if wxUSE_EXTENDED_RTTI
|
|
||||||
WX_DEFINE_FLAGS( wxCheckListBoxStyle )
|
|
||||||
|
|
||||||
wxBEGIN_FLAGS( wxCheckListBoxStyle )
|
|
||||||
// new style border flags, we put them first to
|
|
||||||
// use them for streaming out
|
|
||||||
wxFLAGS_MEMBER(wxBORDER_SIMPLE)
|
|
||||||
wxFLAGS_MEMBER(wxBORDER_SUNKEN)
|
|
||||||
wxFLAGS_MEMBER(wxBORDER_DOUBLE)
|
|
||||||
wxFLAGS_MEMBER(wxBORDER_RAISED)
|
|
||||||
wxFLAGS_MEMBER(wxBORDER_STATIC)
|
|
||||||
wxFLAGS_MEMBER(wxBORDER_NONE)
|
|
||||||
|
|
||||||
// old style border flags
|
|
||||||
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
|
|
||||||
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
|
|
||||||
wxFLAGS_MEMBER(wxDOUBLE_BORDER)
|
|
||||||
wxFLAGS_MEMBER(wxRAISED_BORDER)
|
|
||||||
wxFLAGS_MEMBER(wxSTATIC_BORDER)
|
|
||||||
wxFLAGS_MEMBER(wxBORDER)
|
|
||||||
|
|
||||||
// standard window styles
|
|
||||||
wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
|
|
||||||
wxFLAGS_MEMBER(wxCLIP_CHILDREN)
|
|
||||||
wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
|
|
||||||
wxFLAGS_MEMBER(wxWANTS_CHARS)
|
|
||||||
wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
|
|
||||||
wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
|
|
||||||
wxFLAGS_MEMBER(wxVSCROLL)
|
|
||||||
wxFLAGS_MEMBER(wxHSCROLL)
|
|
||||||
|
|
||||||
wxFLAGS_MEMBER(wxLB_SINGLE)
|
|
||||||
wxFLAGS_MEMBER(wxLB_MULTIPLE)
|
|
||||||
wxFLAGS_MEMBER(wxLB_EXTENDED)
|
|
||||||
wxFLAGS_MEMBER(wxLB_HSCROLL)
|
|
||||||
wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
|
|
||||||
wxFLAGS_MEMBER(wxLB_NEEDED_SB)
|
|
||||||
wxFLAGS_MEMBER(wxLB_SORT)
|
|
||||||
wxFLAGS_MEMBER(wxLB_OWNERDRAW)
|
|
||||||
|
|
||||||
wxEND_FLAGS( wxCheckListBoxStyle )
|
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckListBox, wxListBox,"wx/checklst.h")
|
|
||||||
|
|
||||||
wxBEGIN_PROPERTIES_TABLE(wxCheckListBox)
|
|
||||||
wxEVENT_PROPERTY( Toggle , wxEVT_COMMAND_CHECKLISTBOX_TOGGLED , wxCommandEvent )
|
|
||||||
wxPROPERTY_FLAGS( WindowStyle , wxCheckListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , wxLB_OWNERDRAW /*flags*/ , wxT("Helpstring") , wxT("group")) // style
|
|
||||||
wxEND_PROPERTIES_TABLE()
|
|
||||||
|
|
||||||
wxBEGIN_HANDLERS_TABLE(wxCheckListBox)
|
|
||||||
wxEND_HANDLERS_TABLE()
|
|
||||||
|
|
||||||
wxCONSTRUCTOR_4( wxCheckListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
|
|
||||||
|
|
||||||
#else
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// declaration and implementation of wxCheckListBoxItem class
|
// declaration and implementation of wxCheckListBoxItem class
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -57,8 +57,6 @@ public:
|
|||||||
// implementation of wxCheckListBox
|
// implementation of wxCheckListBox
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// creation
|
// creation
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user