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

renamed wxComboControl to wxComboCtrl and related wxUSE_XXX and configure switches for consistency with the other ones

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-16 22:57:40 +00:00
parent 87419e97c6
commit a57d600f1a
25 changed files with 290 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/generic/combo.h
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/generic/combo.h
// Purpose: Generic wxComboControl
// Purpose: Generic wxComboCtrl
// Author: Jaakko Salli
// Modified by:
// Created: Apr-30-2006
@@ -12,13 +12,13 @@
#ifndef _WX_GENERIC_COMBOCONTROL_H_
#define _WX_GENERIC_COMBOCONTROL_H_
#if wxUSE_COMBOCONTROL
#if wxUSE_COMBOCTRL
// Only define generic if native doesn't have all the features
#if !defined(wxCOMBOCONTROL_FULLY_FEATURED)
// ----------------------------------------------------------------------------
// Generic wxComboControl
// Generic wxComboCtrl
// ----------------------------------------------------------------------------
#if defined(__WXUNIVERSAL__)
@@ -32,11 +32,11 @@
#endif
class WXDLLEXPORT wxGenericComboControl : public wxComboControlBase
class WXDLLEXPORT wxGenericComboControl : public wxComboCtrlBase
{
public:
// ctors and such
wxGenericComboControl() : wxComboControlBase() { Init(); }
wxGenericComboControl() : wxComboCtrlBase() { Init(); }
wxGenericComboControl(wxWindow *parent,
wxWindowID id = wxID_ANY,
@@ -46,7 +46,7 @@ public:
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr)
: wxComboControlBase()
: wxComboCtrlBase()
{
Init();
@@ -64,7 +64,7 @@ public:
virtual ~wxGenericComboControl();
static int GetFeatures() { return wxComboControlFeatures::All; }
static int GetFeatures() { return wxComboCtrlFeatures::All; }
#if defined(__WXUNIVERSAL__)
// we have our own input handler and our own actions
@@ -93,15 +93,15 @@ private:
#ifndef _WX_COMBOCONTROL_H_
// If native wxComboControl was not defined, then prepare a simple
// If native wxComboCtrl was not defined, then prepare a simple
// front-end so that wxRTTI works as expected.
class WXDLLEXPORT wxComboControl : public wxGenericComboControl
class WXDLLEXPORT wxComboCtrl : public wxGenericComboControl
{
public:
wxComboControl() : wxGenericComboControl() {}
wxComboCtrl() : wxGenericComboControl() {}
wxComboControl(wxWindow *parent,
wxComboCtrl(wxWindow *parent,
wxWindowID id = wxID_ANY,
const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
@@ -114,22 +114,22 @@ public:
(void)Create(parent, id, value, pos, size, style, validator, name);
}
virtual ~wxComboControl() {}
virtual ~wxComboCtrl() {}
protected:
private:
DECLARE_DYNAMIC_CLASS(wxComboControl)
DECLARE_DYNAMIC_CLASS(wxComboCtrl)
};
#endif // _WX_COMBOCONTROL_H_
#else
#define wxGenericComboControl wxComboControl
#define wxGenericComboControl wxComboCtrl
#endif // !defined(wxCOMBOCONTROL_FULLY_FEATURED)
#endif // wxUSE_COMBOCONTROL
#endif // wxUSE_COMBOCTRL
#endif
// _WX_GENERIC_COMBOCONTROL_H_