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

168
src/common/combocmn.cpp
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: combocmn.cpp
// Purpose: wxComboControlBase
// Purpose: wxComboCtrlBase
// Author: Jaakko Salli
// Modified by:
// Created: Apr-30-2006
@@ -23,7 +23,7 @@
#pragma hdrstop
#endif
#if wxUSE_COMBOCONTROL
#if wxUSE_COMBOCTRL
#ifndef WX_PRECOMP
#include "wx/defs.h"
@@ -139,7 +139,7 @@
class wxComboFrameEventHandler : public wxEvtHandler
{
public:
wxComboFrameEventHandler( wxComboControlBase* pCb );
wxComboFrameEventHandler( wxComboCtrlBase* pCb );
~wxComboFrameEventHandler();
void OnPopup();
@@ -154,7 +154,7 @@ public:
protected:
wxWindow* m_focusStart;
wxComboControlBase* m_combo;
wxComboCtrlBase* m_combo;
private:
DECLARE_EVENT_TABLE()
@@ -172,7 +172,7 @@ BEGIN_EVENT_TABLE(wxComboFrameEventHandler, wxEvtHandler)
EVT_CLOSE(wxComboFrameEventHandler::OnClose)
END_EVENT_TABLE()
wxComboFrameEventHandler::wxComboFrameEventHandler( wxComboControlBase* combo )
wxComboFrameEventHandler::wxComboFrameEventHandler( wxComboCtrlBase* combo )
: wxEvtHandler()
{
m_combo = combo;
@@ -250,14 +250,14 @@ void wxComboFrameEventHandler::OnMove( wxMoveEvent& event )
// ----------------------------------------------------------------------------
// wxComboPopupWindow is wxPopupWindow customized for
// wxComboControl.
// wxComboCtrl.
// ----------------------------------------------------------------------------
class wxComboPopupWindow : public wxComboPopupWindowBase
{
public:
wxComboPopupWindow( wxComboControlBase *parent, int style = wxBORDER_NONE );
wxComboPopupWindow( wxComboCtrlBase *parent, int style = wxBORDER_NONE );
#if USE_TRANSIENT_POPUP
virtual bool ProcessLeftDown(wxMouseEvent& event);
@@ -291,7 +291,7 @@ BEGIN_EVENT_TABLE(wxComboPopupWindow, wxComboPopupWindowBase)
END_EVENT_TABLE()
wxComboPopupWindow::wxComboPopupWindow( wxComboControlBase *parent,
wxComboPopupWindow::wxComboPopupWindow( wxComboCtrlBase *parent,
int style )
#if wxUSE_POPUPWIN
: wxComboPopupWindowBase(parent,style)
@@ -327,9 +327,9 @@ void wxComboPopupWindow::OnActivate( wxActivateEvent& event )
if ( !event.GetActive() )
{
// Tell combo control that we are dismissed.
wxComboControl* combo = (wxComboControl*) GetParent();
wxComboCtrl* combo = (wxComboCtrl*) GetParent();
wxASSERT( combo );
wxASSERT( combo->IsKindOf(CLASSINFO(wxComboControl)) );
wxASSERT( combo->IsKindOf(CLASSINFO(wxComboCtrl)) );
combo->HidePopup();
@@ -349,9 +349,9 @@ bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event )
// First thing that happens when a transient popup closes is that this method gets called.
void wxComboPopupWindow::OnDismiss()
{
wxComboControlBase* combo = (wxComboControlBase*) GetParent();
wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboControlBase)),
wxT("parent might not be wxComboControl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();
wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
combo->OnPopupDismiss();
}
@@ -381,7 +381,7 @@ wxSize wxComboPopup::GetAdjustedSize( int minWidth,
return wxSize(minWidth,prefHeight);
}
void wxComboPopup::DefaultPaintComboControl( wxComboControlBase* combo,
void wxComboPopup::DefaultPaintComboControl( wxComboCtrlBase* combo,
wxDC& dc, const wxRect& rect )
{
if ( combo->GetWindowStyle() & wxCB_READONLY ) // ie. no textctrl
@@ -434,7 +434,7 @@ class wxComboBoxExtraInputHandler : public wxEvtHandler
{
public:
wxComboBoxExtraInputHandler( wxComboControlBase* combo )
wxComboBoxExtraInputHandler( wxComboCtrlBase* combo )
: wxEvtHandler()
{
m_combo = combo;
@@ -444,7 +444,7 @@ public:
void OnFocus(wxFocusEvent& event);
protected:
wxComboControlBase* m_combo;
wxComboCtrlBase* m_combo;
private:
DECLARE_EVENT_TABLE()
@@ -547,7 +547,7 @@ class wxComboPopupExtraEventHandler : public wxEvtHandler
{
public:
wxComboPopupExtraEventHandler( wxComboControlBase* combo )
wxComboPopupExtraEventHandler( wxComboCtrlBase* combo )
: wxEvtHandler()
{
m_combo = combo;
@@ -557,14 +557,14 @@ public:
void OnMouseEvent( wxMouseEvent& event );
// Called from wxComboControlBase::OnPopupDismiss
// Called from wxComboCtrlBase::OnPopupDismiss
void OnPopupDismiss()
{
m_beenInside = false;
}
protected:
wxComboControlBase* m_combo;
wxComboCtrlBase* m_combo;
bool m_beenInside;
@@ -635,27 +635,27 @@ void wxComboPopupExtraEventHandler::OnMouseEvent( wxMouseEvent& event )
}
// ----------------------------------------------------------------------------
// wxComboControlBase
// wxComboCtrlBase
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxComboControlBase, wxControl)
EVT_TEXT(wxID_ANY,wxComboControlBase::OnTextCtrlEvent)
EVT_SIZE(wxComboControlBase::OnSizeEvent)
EVT_SET_FOCUS(wxComboControlBase::OnFocusEvent)
EVT_KILL_FOCUS(wxComboControlBase::OnFocusEvent)
//EVT_BUTTON(wxID_ANY,wxComboControlBase::OnButtonClickEvent)
EVT_TEXT_ENTER(wxID_ANY,wxComboControlBase::OnTextCtrlEvent)
EVT_SYS_COLOUR_CHANGED(wxComboControlBase::OnSysColourChanged)
BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
EVT_TEXT(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
EVT_SIZE(wxComboCtrlBase::OnSizeEvent)
EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)
//EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)
EVT_TEXT_ENTER(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged)
END_EVENT_TABLE()
IMPLEMENT_ABSTRACT_CLASS(wxComboControlBase, wxControl)
IMPLEMENT_ABSTRACT_CLASS(wxComboCtrlBase, wxControl)
// Have global double buffer - should be enough for multiple combos
static wxBitmap* gs_doubleBuffer = (wxBitmap*) NULL;
void wxComboControlBase::Init()
void wxComboCtrlBase::Init()
{
m_winPopup = (wxWindow *)NULL;
m_popup = (wxWindow *)NULL;
@@ -693,7 +693,7 @@ void wxComboControlBase::Init()
m_timeCanAcceptClick = 0;
}
bool wxComboControlBase::Create(wxWindow *parent,
bool wxComboCtrlBase::Create(wxWindow *parent,
wxWindowID id,
const wxString& value,
const wxPoint& pos,
@@ -720,7 +720,7 @@ bool wxComboControlBase::Create(wxWindow *parent,
return true;
}
void wxComboControlBase::InstallInputHandlers( bool alsoTextCtrl )
void wxComboCtrlBase::InstallInputHandlers( bool alsoTextCtrl )
{
if ( m_text && alsoTextCtrl )
{
@@ -733,7 +733,7 @@ void wxComboControlBase::InstallInputHandlers( bool alsoTextCtrl )
m_extraEvtHandler = inputHandler;
}
void wxComboControlBase::CreateTextCtrl( int extraStyle, const wxValidator& validator )
void wxComboCtrlBase::CreateTextCtrl( int extraStyle, const wxValidator& validator )
{
if ( !(m_windowStyle & wxCB_READONLY) )
{
@@ -757,12 +757,12 @@ void wxComboControlBase::CreateTextCtrl( int extraStyle, const wxValidator& vali
}
}
void wxComboControlBase::OnThemeChange()
void wxComboCtrlBase::OnThemeChange()
{
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
}
wxComboControlBase::~wxComboControlBase()
wxComboCtrlBase::~wxComboCtrlBase()
{
if ( HasCapture() )
ReleaseMouse();
@@ -800,7 +800,7 @@ wxComboControlBase::~wxComboControlBase()
// ----------------------------------------------------------------------------
// Recalculates button and textctrl areas
void wxComboControlBase::CalculateAreas( int btnWidth )
void wxComboCtrlBase::CalculateAreas( int btnWidth )
{
wxSize sz = GetClientSize();
int customBorder = m_widthCustomBorder;
@@ -910,7 +910,7 @@ void wxComboControlBase::CalculateAreas( int btnWidth )
*/
}
void wxComboControlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust )
void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust )
{
if ( !m_text )
return;
@@ -952,7 +952,7 @@ void wxComboControlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdj
}
}
wxSize wxComboControlBase::DoGetBestSize() const
wxSize wxComboCtrlBase::DoGetBestSize() const
{
wxSize sizeText(150,0);
@@ -999,7 +999,7 @@ wxSize wxComboControlBase::DoGetBestSize() const
return ret;
}
void wxComboControlBase::DoMoveWindow(int x, int y, int width, int height)
void wxComboCtrlBase::DoMoveWindow(int x, int y, int width, int height)
{
// SetSize is called last in create, so it marks the end of creation
m_iFlags |= wxCC_IFLAG_CREATED;
@@ -1007,12 +1007,12 @@ void wxComboControlBase::DoMoveWindow(int x, int y, int width, int height)
wxControl::DoMoveWindow(x, y, width, height);
}
void wxComboControlBase::OnSizeEvent( wxSizeEvent& event )
void wxComboCtrlBase::OnSizeEvent( wxSizeEvent& event )
{
if ( !IsCreated() )
return;
// defined by actual wxComboControls
// defined by actual wxComboCtrls
OnResize();
event.Skip();
@@ -1022,7 +1022,7 @@ void wxComboControlBase::OnSizeEvent( wxSizeEvent& event )
// standard operations
// ----------------------------------------------------------------------------
bool wxComboControlBase::Enable(bool enable)
bool wxComboCtrlBase::Enable(bool enable)
{
if ( !wxControl::Enable(enable) )
return false;
@@ -1035,7 +1035,7 @@ bool wxComboControlBase::Enable(bool enable)
return true;
}
bool wxComboControlBase::Show(bool show)
bool wxComboCtrlBase::Show(bool show)
{
if ( !wxControl::Show(show) )
return false;
@@ -1049,7 +1049,7 @@ bool wxComboControlBase::Show(bool show)
return true;
}
bool wxComboControlBase::SetFont ( const wxFont& font )
bool wxComboCtrlBase::SetFont ( const wxFont& font )
{
if ( !wxControl::SetFont(font) )
return false;
@@ -1061,7 +1061,7 @@ bool wxComboControlBase::SetFont ( const wxFont& font )
}
#if wxUSE_TOOLTIPS
void wxComboControlBase::DoSetToolTip(wxToolTip *tooltip)
void wxComboCtrlBase::DoSetToolTip(wxToolTip *tooltip)
{
wxControl::DoSetToolTip(tooltip);
@@ -1085,7 +1085,7 @@ void wxComboControlBase::DoSetToolTip(wxToolTip *tooltip)
// ----------------------------------------------------------------------------
// draw focus background on area in a way typical on platform
void wxComboControlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags )
void wxComboCtrlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags )
{
wxSize sz = GetClientSize();
bool isEnabled;
@@ -1150,7 +1150,7 @@ void wxComboControlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int
dc.DrawRectangle( selRect );
}
void wxComboControlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
{
int drawState = m_btnState;
@@ -1239,7 +1239,7 @@ void wxComboControlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg
}
}
void wxComboControlBase::RecalcAndRefresh()
void wxComboCtrlBase::RecalcAndRefresh()
{
if ( IsCreated() )
{
@@ -1249,7 +1249,7 @@ void wxComboControlBase::RecalcAndRefresh()
}
}
wxBitmap& wxComboControlBase::GetBufferBitmap( const wxSize& sz ) const
wxBitmap& wxComboCtrlBase::GetBufferBitmap( const wxSize& sz ) const
{
// If size is larger, recalculate double buffer bitmap
if ( !gs_doubleBuffer ||
@@ -1266,7 +1266,7 @@ wxBitmap& wxComboControlBase::GetBufferBitmap( const wxSize& sz ) const
// miscellaneous event handlers
// ----------------------------------------------------------------------------
void wxComboControlBase::OnTextCtrlEvent(wxCommandEvent& event)
void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
{
// Change event id and relay it forward
event.SetId(GetId());
@@ -1274,7 +1274,7 @@ void wxComboControlBase::OnTextCtrlEvent(wxCommandEvent& event)
}
// call if cursor is on button area or mouse is captured for the button
bool wxComboControlBase::HandleButtonMouseEvent( wxMouseEvent& event,
bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event,
int flags )
{
int type = event.GetEventType();
@@ -1364,8 +1364,8 @@ bool wxComboControlBase::HandleButtonMouseEvent( wxMouseEvent& event,
// Conversion to double-clicks and some basic filtering
// returns true if event was consumed or filtered
//bool wxComboControlBase::PreprocessMouseEvent( wxMouseEvent& event, bool isOnButtonArea )
bool wxComboControlBase::PreprocessMouseEvent( wxMouseEvent& event,
//bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event, bool isOnButtonArea )
bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event,
int flags )
{
wxLongLong t = ::wxGetLocalTimeMillis();
@@ -1423,7 +1423,7 @@ bool wxComboControlBase::PreprocessMouseEvent( wxMouseEvent& event,
return false;
}
void wxComboControlBase::HandleNormalMouseEvent( wxMouseEvent& event )
void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event )
{
int evtType = event.GetEventType();
@@ -1467,7 +1467,7 @@ void wxComboControlBase::HandleNormalMouseEvent( wxMouseEvent& event )
event.Skip();
}
void wxComboControlBase::OnFocusEvent( wxFocusEvent& )
void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& )
{
// First click is the first part of double-click
// Some platforms don't generate down-less mouse up-event
@@ -1486,7 +1486,7 @@ void wxComboControlBase::OnFocusEvent( wxFocusEvent& )
Refresh();
}
void wxComboControlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
{
OnThemeChange();
// indentation may also have changed
@@ -1500,7 +1500,7 @@ void wxComboControlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(ev
// ----------------------------------------------------------------------------
// Create popup window and the child control
void wxComboControlBase::CreatePopup()
void wxComboCtrlBase::CreatePopup()
{
wxComboPopup* popupInterface = m_popupInterface;
wxWindow* popup;
@@ -1522,9 +1522,9 @@ void wxComboControlBase::CreatePopup()
popupInterface->m_iFlags |= wxCP_IFLAG_CREATED;
}
void wxComboControlBase::SetPopupControl( wxComboPopup* iface )
void wxComboCtrlBase::SetPopupControl( wxComboPopup* iface )
{
wxCHECK_RET( iface, wxT("no popup interface set for wxComboControl") );
wxCHECK_RET( iface, wxT("no popup interface set for wxComboCtrl") );
delete m_popupInterface;
delete m_winPopup;
@@ -1552,20 +1552,20 @@ void wxComboControlBase::SetPopupControl( wxComboPopup* iface )
}
// Ensures there is atleast the default popup
void wxComboControlBase::EnsurePopupControl()
void wxComboCtrlBase::EnsurePopupControl()
{
if ( !m_popupInterface )
SetPopupControl(NULL);
}
void wxComboControlBase::OnButtonClick()
void wxComboCtrlBase::OnButtonClick()
{
// Derived classes can override this method for totally custom
// popup action
ShowPopup();
}
void wxComboControlBase::ShowPopup()
void wxComboCtrlBase::ShowPopup()
{
EnsurePopupControl();
wxCHECK_RET( !IsPopupShown(), wxT("popup window already shown") );
@@ -1708,7 +1708,7 @@ void wxComboControlBase::ShowPopup()
}
void wxComboControlBase::OnPopupDismiss()
void wxComboCtrlBase::OnPopupDismiss()
{
// Just in case, avoid double dismiss
if ( !m_isPopupShown )
@@ -1758,7 +1758,7 @@ void wxComboControlBase::OnPopupDismiss()
}
void wxComboControlBase::HidePopup()
void wxComboCtrlBase::HidePopup()
{
// Should be able to call this without popup interface
//wxCHECK_RET( m_popupInterface, _T("no popup interface") );
@@ -1781,7 +1781,7 @@ void wxComboControlBase::HidePopup()
// customization methods
// ----------------------------------------------------------------------------
void wxComboControlBase::SetButtonPosition( int width, int height,
void wxComboCtrlBase::SetButtonPosition( int width, int height,
int side, int spacingX )
{
m_btnWid = width;
@@ -1792,7 +1792,7 @@ void wxComboControlBase::SetButtonPosition( int width, int height,
RecalcAndRefresh();
}
void wxComboControlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
void wxComboCtrlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
bool blankButtonBg,
const wxBitmap& bmpPressed,
const wxBitmap& bmpHover,
@@ -1819,7 +1819,7 @@ void wxComboControlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
RecalcAndRefresh();
}
void wxComboControlBase::SetCustomPaintWidth( int width )
void wxComboCtrlBase::SetCustomPaintWidth( int width )
{
if ( m_text )
{
@@ -1836,7 +1836,7 @@ void wxComboControlBase::SetCustomPaintWidth( int width )
RecalcAndRefresh();
}
void wxComboControlBase::SetTextIndent( int indent )
void wxComboCtrlBase::SetTextIndent( int indent )
{
if ( indent < 0 )
{
@@ -1852,7 +1852,7 @@ void wxComboControlBase::SetTextIndent( int indent )
RecalcAndRefresh();
}
wxCoord wxComboControlBase::GetNativeTextIndent() const
wxCoord wxComboCtrlBase::GetNativeTextIndent() const
{
return DEFAULT_TEXT_INDENT;
}
@@ -1861,14 +1861,14 @@ wxCoord wxComboControlBase::GetNativeTextIndent() const
// methods forwarded to wxTextCtrl
// ----------------------------------------------------------------------------
wxString wxComboControlBase::GetValue() const
wxString wxComboCtrlBase::GetValue() const
{
if ( m_text )
return m_text->GetValue();
return m_valueString;
}
void wxComboControlBase::SetValue(const wxString& value)
void wxComboCtrlBase::SetValue(const wxString& value)
{
if ( m_text )
{
@@ -1890,7 +1890,7 @@ void wxComboControlBase::SetValue(const wxString& value)
}
// In this SetValue variant wxComboPopup::SetStringValue is not called
void wxComboControlBase::SetText(const wxString& value)
void wxComboCtrlBase::SetText(const wxString& value)
{
// Unlike in SetValue(), this must be called here or
// the behaviour will no be consistent in readonlys.
@@ -1901,37 +1901,37 @@ void wxComboControlBase::SetText(const wxString& value)
Refresh();
}
void wxComboControlBase::Copy()
void wxComboCtrlBase::Copy()
{
if ( m_text )
m_text->Copy();
}
void wxComboControlBase::Cut()
void wxComboCtrlBase::Cut()
{
if ( m_text )
m_text->Cut();
}
void wxComboControlBase::Paste()
void wxComboCtrlBase::Paste()
{
if ( m_text )
m_text->Paste();
}
void wxComboControlBase::SetInsertionPoint(long pos)
void wxComboCtrlBase::SetInsertionPoint(long pos)
{
if ( m_text )
m_text->SetInsertionPoint(pos);
}
void wxComboControlBase::SetInsertionPointEnd()
void wxComboCtrlBase::SetInsertionPointEnd()
{
if ( m_text )
m_text->SetInsertionPointEnd();
}
long wxComboControlBase::GetInsertionPoint() const
long wxComboCtrlBase::GetInsertionPoint() const
{
if ( m_text )
return m_text->GetInsertionPoint();
@@ -1939,7 +1939,7 @@ long wxComboControlBase::GetInsertionPoint() const
return 0;
}
long wxComboControlBase::GetLastPosition() const
long wxComboCtrlBase::GetLastPosition() const
{
if ( m_text )
return m_text->GetLastPosition();
@@ -1947,28 +1947,28 @@ long wxComboControlBase::GetLastPosition() const
return 0;
}
void wxComboControlBase::Replace(long from, long to, const wxString& value)
void wxComboCtrlBase::Replace(long from, long to, const wxString& value)
{
if ( m_text )
m_text->Replace(from, to, value);
}
void wxComboControlBase::Remove(long from, long to)
void wxComboCtrlBase::Remove(long from, long to)
{
if ( m_text )
m_text->Remove(from, to);
}
void wxComboControlBase::SetSelection(long from, long to)
void wxComboCtrlBase::SetSelection(long from, long to)
{
if ( m_text )
m_text->SetSelection(from, to);
}
void wxComboControlBase::Undo()
void wxComboCtrlBase::Undo()
{
if ( m_text )
m_text->Undo();
}
#endif // wxUSE_COMBOCONTROL
#endif // wxUSE_COMBOCTRL