Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make wxChoice and wxListBox inherit from wxControlWithItems and not wxControl for all ports

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-08-15 20:31:06 +00:00
parent f31bbefd10
commit b1294ada8e
16 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cocoa/choice.mm
View File

@@ -29,7 +29,7 @@
#import <Foundation/NSNotification.h> #import <Foundation/NSNotification.h>
#import <Foundation/NSDictionary.h> #import <Foundation/NSDictionary.h>
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
BEGIN_EVENT_TABLE(wxChoice, wxChoiceBase) BEGIN_EVENT_TABLE(wxChoice, wxChoiceBase)
END_EVENT_TABLE() END_EVENT_TABLE()
// WX_IMPLEMENT_COCOA_OWNER(wxChoice,NSButton,NSControl,NSView) // WX_IMPLEMENT_COCOA_OWNER(wxChoice,NSButton,NSControl,NSView)

2
src/cocoa/listbox.mm
View File

@@ -29,7 +29,7 @@
#import <AppKit/NSTableView.h> #import <AppKit/NSTableView.h>
#import <AppKit/NSTableColumn.h> #import <AppKit/NSTableColumn.h>
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase) BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
END_EVENT_TABLE() END_EVENT_TABLE()
WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView) WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView)

2
src/gtk/choice.cpp
View File

@@ -70,7 +70,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
// wxChoice // wxChoice
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl) IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
wxChoice::wxChoice() wxChoice::wxChoice()
{ {

2
src/gtk/listbox.cpp
View File

@@ -272,7 +272,7 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model,
// wxListBox // wxListBox
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// construction // construction

2
src/gtk1/choice.cpp
View File

@@ -86,7 +86,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
// wxChoice // wxChoice
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl) IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
wxChoice::wxChoice() wxChoice::wxChoice()
{ {

2
src/gtk1/listbox.cpp
View File

@@ -450,7 +450,7 @@ gtk_listbox_realized_callback( GtkWidget *m_widget, wxListBox *win )
// wxListBox // wxListBox
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// construction // construction

2
src/mac/carbon/choice.cpp
View File

@@ -24,7 +24,7 @@
extern MenuHandle NewUniqueMenu() ; extern MenuHandle NewUniqueMenu() ;
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
wxChoice::~wxChoice() wxChoice::~wxChoice()

2
src/mac/carbon/listbox.cpp
View File

@@ -24,7 +24,7 @@
#include "wx/dcclient.h" #include "wx/dcclient.h"
#endif #endif
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
BEGIN_EVENT_TABLE(wxListBox, wxControl) BEGIN_EVENT_TABLE(wxListBox, wxControl)
END_EVENT_TABLE() END_EVENT_TABLE()

2
src/motif/choice.cpp
View File

@@ -43,7 +43,7 @@
#define WIDTH_OVERHEAD_SUBTRACT 40 #define WIDTH_OVERHEAD_SUBTRACT 40
#define HEIGHT_OVERHEAD 15 #define HEIGHT_OVERHEAD 15
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
void wxChoiceCallback (Widget w, XtPointer clientData, void wxChoiceCallback (Widget w, XtPointer clientData,
XtPointer ptr); XtPointer ptr);

2
src/motif/listbox.cpp
View File

@@ -38,7 +38,7 @@
#endif #endif
#include "wx/motif/private.h" #include "wx/motif/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
static void wxListBoxCallback(Widget w, static void wxListBoxCallback(Widget w,
XtPointer clientData, XtPointer clientData,

2
src/os2/choice.cpp
View File

@@ -24,7 +24,7 @@
#include "wx/os2/private.h" #include "wx/os2/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
bool wxChoice::Create( bool wxChoice::Create(
wxWindow* pParent wxWindow* pParent

2
src/os2/listbox.cpp
View File

@@ -38,7 +38,7 @@
#include "wx/ownerdrw.h" #include "wx/ownerdrw.h"
#endif #endif
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
// ============================================================================ // ============================================================================
// list box item declaration and implementation // list box item declaration and implementation

2
src/palmos/choice.cpp
View File

@@ -85,7 +85,7 @@ wxEND_HANDLERS_TABLE()
wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
#else #else
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
#endif #endif
// ============================================================================ // ============================================================================

2
src/palmos/listbox.cpp
View File

@@ -95,7 +95,7 @@ wxEND_HANDLERS_TABLE()
wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
#else #else
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
#endif #endif
// ============================================================================ // ============================================================================

2
src/univ/choice.cpp
View File

@@ -31,7 +31,7 @@
#include "wx/arrstr.h" #include "wx/arrstr.h"
#endif #endif
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
BEGIN_EVENT_TABLE(wxChoice, wxComboBox) BEGIN_EVENT_TABLE(wxChoice, wxComboBox)
EVT_COMBOBOX(wxID_ANY, wxChoice::OnComboBox) EVT_COMBOBOX(wxID_ANY, wxChoice::OnComboBox)

2
src/univ/listbox.cpp
View File

@@ -97,7 +97,7 @@ protected:
// implementation of wxListBox // implementation of wxListBox
// ============================================================================ // ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase) BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
EVT_SIZE(wxListBox::OnSize) EVT_SIZE(wxListBox::OnSize)