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

[ 1557284 ] wxGenericComboControl -> wxGenericComboCtrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-09-19 17:29:45 +00:00
parent ce22ac4592
commit 129c8cf352
3 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,8 +9,8 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GENERIC_COMBOCONTROL_H_ #ifndef _WX_GENERIC_COMBOCTRL_H_
#define _WX_GENERIC_COMBOCONTROL_H_ #define _WX_GENERIC_COMBOCTRL_H_
#if wxUSE_COMBOCTRL #if wxUSE_COMBOCTRL
@@ -33,20 +33,20 @@
extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[]; extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[];
class WXDLLEXPORT wxGenericComboControl : public wxComboCtrlBase class WXDLLEXPORT wxGenericComboCtrl : public wxComboCtrlBase
{ {
public: public:
// ctors and such // ctors and such
wxGenericComboControl() : wxComboCtrlBase() { Init(); } wxGenericComboCtrl() : wxComboCtrlBase() { Init(); }
wxGenericComboControl(wxWindow *parent, wxGenericComboCtrl(wxWindow *parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr) const wxString& name = wxComboBoxNameStr)
: wxComboCtrlBase() : wxComboCtrlBase()
{ {
Init(); Init();
@@ -63,7 +63,7 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr); const wxString& name = wxComboBoxNameStr);
virtual ~wxGenericComboControl(); virtual ~wxGenericComboCtrl();
virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const; virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const;
@@ -90,7 +90,7 @@ private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxGenericComboControl) DECLARE_DYNAMIC_CLASS(wxGenericComboCtrl)
}; };
@@ -99,20 +99,20 @@ private:
// If native wxComboCtrl 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. // front-end so that wxRTTI works as expected.
class WXDLLEXPORT wxComboCtrl : public wxGenericComboControl class WXDLLEXPORT wxComboCtrl : public wxGenericComboCtrl
{ {
public: public:
wxComboCtrl() : wxGenericComboControl() {} wxComboCtrl() : wxGenericComboCtrl() {}
wxComboCtrl(wxWindow *parent, wxComboCtrl(wxWindow *parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
const wxString& value = wxEmptyString, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr) const wxString& name = wxComboBoxNameStr)
: wxGenericComboControl() : wxGenericComboCtrl()
{ {
(void)Create(parent, id, value, pos, size, style, validator, name); (void)Create(parent, id, value, pos, size, style, validator, name);
} }
@@ -129,10 +129,10 @@ private:
#else #else
#define wxGenericComboControl wxComboCtrl #define wxGenericComboCtrl wxComboCtrl
#endif // !defined(wxCOMBOCONTROL_FULLY_FEATURED) #endif // !defined(wxCOMBOCONTROL_FULLY_FEATURED)
#endif // wxUSE_COMBOCTRL #endif // wxUSE_COMBOCTRL
#endif #endif
// _WX_GENERIC_COMBOCONTROL_H_ // _WX_GENERIC_COMBOCTRL_H_

8
samples/combo/combo.cpp
View File

@@ -627,7 +627,7 @@ MyFrame::MyFrame(const wxString& title)
wxComboCtrl* cc; wxComboCtrl* cc;
wxGenericComboControl* gcc; wxGenericComboCtrl* gcc;
wxOwnerDrawnComboBox* odc; wxOwnerDrawnComboBox* odc;
// Create common strings array // Create common strings array
@@ -745,9 +745,9 @@ MyFrame::MyFrame(const wxString& title)
// Tree Ctrl wxComboCtrl // Tree Ctrl wxComboCtrl
// //
// Note that we test that wxGenericComboControl works // Note that we test that wxGenericComboCtrl works
gcc = new wxGenericComboControl(panel,wxID_ANY,wxEmptyString, gcc = new wxGenericComboCtrl(panel,wxID_ANY,wxEmptyString,
wxDefaultPosition, wxDefaultSize); wxDefaultPosition, wxDefaultSize);
// Set popup interface right away, otherwise some of the calls // Set popup interface right away, otherwise some of the calls
// below may fail // below may fail

50
src/generic/combog.cpp
View File

@@ -86,29 +86,29 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxGenericComboControl // wxGenericComboCtrl
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxGenericComboControl, wxComboCtrlBase) BEGIN_EVENT_TABLE(wxGenericComboCtrl, wxComboCtrlBase)
EVT_PAINT(wxGenericComboControl::OnPaintEvent) EVT_PAINT(wxGenericComboCtrl::OnPaintEvent)
EVT_MOUSE_EVENTS(wxGenericComboControl::OnMouseEvent) EVT_MOUSE_EVENTS(wxGenericComboCtrl::OnMouseEvent)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxGenericComboControl, wxComboCtrlBase) IMPLEMENT_DYNAMIC_CLASS(wxGenericComboCtrl, wxComboCtrlBase)
void wxGenericComboControl::Init() void wxGenericComboCtrl::Init()
{ {
} }
bool wxGenericComboControl::Create(wxWindow *parent, bool wxGenericComboCtrl::Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& value, const wxString& value,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
const wxValidator& validator, const wxValidator& validator,
const wxString& name) const wxString& name)
{ {
// Set border // Set border
@@ -120,12 +120,12 @@ bool wxGenericComboControl::Create(wxWindow *parent,
border = wxBORDER_SIMPLE; border = wxBORDER_SIMPLE;
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
// For XP, have 1-width custom border, for older version use sunken // For XP, have 1-width custom border, for older version use sunken
if ( wxUxThemeEngine::GetIfActive() ) /*if ( wxUxThemeEngine::GetIfActive() )
{ {
border = wxBORDER_NONE; border = wxBORDER_NONE;
m_widthCustomBorder = 1; m_widthCustomBorder = 1;
} }
else else*/
border = wxBORDER_SUNKEN; border = wxBORDER_SUNKEN;
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
border = wxBORDER_NONE; border = wxBORDER_NONE;
@@ -172,11 +172,11 @@ bool wxGenericComboControl::Create(wxWindow *parent,
return true; return true;
} }
wxGenericComboControl::~wxGenericComboControl() wxGenericComboCtrl::~wxGenericComboCtrl()
{ {
} }
void wxGenericComboControl::OnResize() void wxGenericComboCtrl::OnResize()
{ {
// Recalculates button and textctrl areas // Recalculates button and textctrl areas
@@ -198,7 +198,7 @@ void wxGenericComboControl::OnResize()
PositionTextCtrl( TEXTCTRLXADJUST, TEXTCTRLYADJUST ); PositionTextCtrl( TEXTCTRLXADJUST, TEXTCTRLYADJUST );
} }
void wxGenericComboControl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) ) void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
{ {
wxSize sz = GetClientSize(); wxSize sz = GetClientSize();
wxBufferedPaintDC dc(this,GetBufferBitmap(sz)); wxBufferedPaintDC dc(this,GetBufferBitmap(sz));
@@ -278,7 +278,7 @@ void wxGenericComboControl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
} }
} }
void wxGenericComboControl::OnMouseEvent( wxMouseEvent& event ) void wxGenericComboCtrl::OnMouseEvent( wxMouseEvent& event )
{ {
bool isOnButtonArea = m_btnArea.Contains(event.m_x,event.m_y); bool isOnButtonArea = m_btnArea.Contains(event.m_x,event.m_y);
int handlerFlags = isOnButtonArea ? wxCC_MF_ON_BUTTON : 0; int handlerFlags = isOnButtonArea ? wxCC_MF_ON_BUTTON : 0;
@@ -321,7 +321,7 @@ void wxGenericComboControl::OnMouseEvent( wxMouseEvent& event )
} }
bool wxGenericComboControl::IsKeyPopupToggle(const wxKeyEvent& event) const bool wxGenericComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
{ {
int keycode = event.GetKeyCode(); int keycode = event.GetKeyCode();
bool isPopupShown = IsPopupShown(); bool isPopupShown = IsPopupShown();
@@ -345,9 +345,9 @@ bool wxGenericComboControl::IsKeyPopupToggle(const wxKeyEvent& event) const
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
bool wxGenericComboControl::PerformAction(const wxControlAction& action, bool wxGenericComboCtrl::PerformAction(const wxControlAction& action,
long numArg, long numArg,
const wxString& strArg) const wxString& strArg)
{ {
bool processed = false; bool processed = false;
if ( action == wxACTION_COMBOBOX_POPUP ) if ( action == wxACTION_COMBOBOX_POPUP )
@@ -383,7 +383,7 @@ bool wxGenericComboControl::PerformAction(const wxControlAction& action,
// If native wxComboCtrl 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. // front-end so that wxRTTI works as expected.
#ifndef _WX_COMBOCONTROL_H_ #ifndef _WX_COMBOCONTROL_H_
IMPLEMENT_DYNAMIC_CLASS(wxComboCtrl, wxGenericComboControl) IMPLEMENT_DYNAMIC_CLASS(wxComboCtrl, wxGenericComboCtrl)
#endif #endif
#endif // !wxCOMBOCONTROL_FULLY_FEATURED #endif // !wxCOMBOCONTROL_FULLY_FEATURED