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

1. sorted wxListBox and wxComboBox seem to work under wxGTK

Browse Source 
2. to support this, new class wxControlWithItems added (ctrlsub.h/cpp) and the
   controls sample modified to test it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-22 18:00:39 +00:00
parent 2ee3ee1bc8
commit 6c8a980fc4
28 changed files with 657 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
include/wx/choice.h
View File

@@ -20,7 +20,7 @@
#pragma interface "choicebase.h"
#endif
#include "wx/control.h" // the base class
#include "wx/ctrlsub.h" // the base class
// ----------------------------------------------------------------------------
// global data
@@ -32,88 +32,26 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
// wxChoice allows to select one of a non-modifiable list of strings
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxChoiceBase : public wxControl
class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
{
public:
// ctor
wxChoiceBase() { m_clientDataItemsType = ClientData_None; }
// all generic methods are in wxControlWithItems
// add a new item to the list
// no client data
void Append(const wxString& item) { DoAppend(item); }
// with client data which belongs to the caller
void Append(const wxString &item, void* clientData)
{ int n = DoAppend(item); SetClientData(n, clientData); }
// with client data which will be deleted by the control
void Append(const wxString &item, wxClientData* clientData)
{ int n = DoAppend(item); SetClientObject(n, clientData); }
// delete items from the list
// one item
virtual void Delete(int n) = 0;
// all of them
virtual void Clear() = 0;
// selection (at most one item may be selected in wxChoice)
// get the index of currently selected item or -1
virtual int GetSelection() const = 0;
// get the text of the currently selected item or empty string
virtual wxString GetStringSelection() const;
// set selectionto current item
// single selection logic
virtual void SetSelection(int n) = 0;
// set selection to the current item, returns TRUE if ok
virtual bool SetStringSelection(const wxString& sel);
virtual bool SetStringSelection(const wxString& s);
// accessors to the list of strings
// get the number of items in the list of strings
virtual int GetCount() const = 0;
// find string in the list, return wxNOT_FOUND if not found
virtual int FindString(const wxString& s) const = 0;
// get the string with the specified index
virtual wxString GetString(int n) const = 0;
// don't override this
virtual void Select(int n) { SetSelection(n); }
// set/get the number of columns in the control (as they're not supporte on
// most platforms, they do nothing by default)
virtual void SetColumns(int WXUNUSED(n) = 1 ) { }
virtual int GetColumns() const { return 1 ; }
// client data
// untyped (isn't deleted by the control)
void SetClientData( int n, void* clientData );
void* GetClientData( int n ) const;
// typed (is owned and deleted by the control)
void SetClientObject( int n, wxClientData* clientData );
wxClientData* GetClientObject( int n ) const;
// emulate selecting the item event.GetInt()
void Command(wxCommandEvent& event);
// emulate selecting the item event.GetInt() from the control
virtual void Command(wxCommandEvent &event);
// deprecated functions, heer for backwards compatibility only
int Number() const { return GetCount(); }
protected:
// pure virtuals to implement in the derived classes
virtual int DoAppend(const wxString& item) = 0;
virtual void DoSetClientData( int n, void* clientData ) = 0;
virtual void* DoGetClientData( int n ) const = 0;
virtual void DoSetClientObject( int n, wxClientData* clientData ) = 0;
virtual wxClientData* DoGetClientObject( int n ) const = 0;
// the above pure virtuals hide these virtuals in wxWindowBase
virtual void DoSetClientData(void* clientData )
{ wxWindowBase::DoSetClientData(clientData); };
virtual void* DoGetClientData() const
{ return(wxWindowBase::DoGetClientData()); };
virtual void DoSetClientObject( wxClientData* clientData )
{ wxWindowBase::DoSetClientObject(clientData); };
virtual wxClientData* DoGetClientObject() const
{ return(wxWindowBase::DoGetClientObject()); };
// the type of the client data for the items
wxClientDataType m_clientDataItemsType;
};
// ----------------------------------------------------------------------------

98
include/wx/ctrlsub.h Normal file
View File

@@ -0,0 +1,98 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/ctrlsub.h (read: "wxConTRoL with SUBitems")
// Purpose: wxControlWithItems interface
// Author: Vadim Zeitlin
// Modified by:
// Created: 22.10.99
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CTRLSUB_H_BASE_
#define _WX_CTRLSUB_H_BASE_
#ifdef __GNUG__
#pragma interface "controlwithitems.h"
#endif
#include "wx/control.h" // base class
// ----------------------------------------------------------------------------
// wxControlWithItems defines an interface which is implemented by all controls
// which have string subitems each of which may be selected.
//
// Examples: wxListBox, wxCheckListBox, wxChoice and wxComboBox
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxControlWithItems : public wxControl
{
public:
wxControlWithItems() { m_clientDataItemsType = ClientData_None; }
// adding items
// ------------
void Append(const wxString& item)
{ DoAppend(item); }
void Append(const wxString& item, void *clientData)
{ int n = DoAppend(item); SetClientData(n, clientData); }
void Append(const wxString& item, wxClientData *clientData)
{ int n = DoAppend(item); SetClientObject(n, clientData); }
// deleting items
// --------------
virtual void Clear() = 0;
virtual void Delete(int n) = 0;
// accessing strings
// -----------------
virtual int GetCount() const = 0;
virtual wxString GetString(int n) const = 0;
virtual void SetString(int n, const wxString& s) = 0;
virtual int FindString(const wxString& s) const = 0;
// selection
// ---------
virtual void Select(int n) = 0;
virtual int GetSelection() const = 0;
wxString GetStringSelection() const;
// misc
// ----
// client data stuff
void SetClientData(int n, void* clientData);
void* GetClientData(int n) const;
void SetClientObject(int n, wxClientData* clientData);
wxClientData* GetClientObject(int n) const;
bool HasClientObjectData() const
{ return m_clientDataItemsType == ClientData_Object; }
bool HasClientUntypedData() const
{ return m_clientDataItemsType == ClientData_Void; }
// compatibility - these functions are deprecated, use the new ones
// instead
int Number() const { return GetCount(); }
protected:
virtual int DoAppend(const wxString& item) = 0;
virtual void DoSetItemClientData(int n, void* clientData) = 0;
virtual void* DoGetItemClientData(int n) const = 0;
virtual void DoSetItemClientObject(int n, wxClientData* clientData) = 0;
virtual wxClientData* DoGetItemClientObject(int n) const = 0;
// the type of the client data for the items
wxClientDataType m_clientDataItemsType;
};
#endif // _WX_CTRLSUB_H_BASE_

21
include/wx/gtk/choice.h
View File

@@ -51,8 +51,9 @@ public:
void SetSelection( int n );
virtual int GetCount() const;
int FindString( const wxString &string ) const;
int FindString( const wxString& string ) const;
wxString GetString( int n ) const;
void SetString( int n, const wxString& string );
// implementation
wxList m_clientList; // contains the client data for the items
@@ -65,20 +66,10 @@ public:
protected:
virtual int DoAppend(const wxString& item);
virtual void DoSetClientData( int n, void* clientData );
virtual void* DoGetClientData( int n ) const;
virtual void DoSetClientObject( int n, wxClientData* clientData );
virtual wxClientData* DoGetClientObject( int n ) const;
// the above virtuals hide these virtuals in wxChoiceBase
virtual void DoSetClientData(void* clientData )
{ wxWindowBase::DoSetClientData(clientData); };
virtual void* DoGetClientData() const
{ return(wxWindowBase::DoGetClientData()); };
virtual void DoSetClientObject( wxClientData* clientData )
{ wxWindowBase::DoSetClientObject(clientData); };
virtual wxClientData* DoGetClientObject() const
{ return(wxWindowBase::DoGetClientObject()); };
virtual void DoSetItemClientData( int n, void* clientData );
virtual void* DoGetItemClientData( int n ) const;
virtual void DoSetItemClientObject( int n, wxClientData* clientData );
virtual wxClientData* DoGetItemClientObject( int n ) const;
private:
// common part of Create() and DoAppend()

8
include/wx/gtk/listbox.h
View File

@@ -69,10 +69,10 @@ public:
virtual void DoSetFirstItem(int n);
virtual void DoSetClientData(int n, void* clientData);
virtual void* DoGetClientData(int n) const;
virtual void DoSetClientObject(int n, wxClientData* clientData);
virtual wxClientData* DoGetClientObject(int n) const;
virtual void DoSetItemClientData(int n, void* clientData);
virtual void* DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject(int n, wxClientData* clientData);
virtual wxClientData* DoGetItemClientObject(int n) const;
// implementation from now on

21
include/wx/gtk1/choice.h
View File

@@ -51,8 +51,9 @@ public:
void SetSelection( int n );
virtual int GetCount() const;
int FindString( const wxString &string ) const;
int FindString( const wxString& string ) const;
wxString GetString( int n ) const;
void SetString( int n, const wxString& string );
// implementation
wxList m_clientList; // contains the client data for the items
@@ -65,20 +66,10 @@ public:
protected:
virtual int DoAppend(const wxString& item);
virtual void DoSetClientData( int n, void* clientData );
virtual void* DoGetClientData( int n ) const;
virtual void DoSetClientObject( int n, wxClientData* clientData );
virtual wxClientData* DoGetClientObject( int n ) const;
// the above virtuals hide these virtuals in wxChoiceBase
virtual void DoSetClientData(void* clientData )
{ wxWindowBase::DoSetClientData(clientData); };
virtual void* DoGetClientData() const
{ return(wxWindowBase::DoGetClientData()); };
virtual void DoSetClientObject( wxClientData* clientData )
{ wxWindowBase::DoSetClientObject(clientData); };
virtual wxClientData* DoGetClientObject() const
{ return(wxWindowBase::DoGetClientObject()); };
virtual void DoSetItemClientData( int n, void* clientData );
virtual void* DoGetItemClientData( int n ) const;
virtual void DoSetItemClientObject( int n, wxClientData* clientData );
virtual wxClientData* DoGetItemClientObject( int n ) const;
private:
// common part of Create() and DoAppend()

8
include/wx/gtk1/listbox.h
View File

@@ -69,10 +69,10 @@ public:
virtual void DoSetFirstItem(int n);
virtual void DoSetClientData(int n, void* clientData);
virtual void* DoGetClientData(int n) const;
virtual void DoSetClientObject(int n, wxClientData* clientData);
virtual wxClientData* DoGetClientObject(int n) const;
virtual void DoSetItemClientData(int n, void* clientData);
virtual void* DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject(int n, wxClientData* clientData);
virtual wxClientData* DoGetItemClientObject(int n) const;
// implementation from now on

84
include/wx/listbox.h
View File

@@ -6,7 +6,7 @@
// Created: 22.10.99
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
// Licence: wxWindows licence
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_LISTBOX_H_BASE_
@@ -24,7 +24,7 @@
#if wxUSE_LISTBOX
#include "wx/control.h" // base class
#include "wx/ctrlsub.h" // base class
// forward declarations are enough here
class WXDLLEXPORT wxArrayInt;
@@ -40,21 +40,11 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr;
// wxListBox interface is defined by the class wxListBoxBase
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxListBoxBase : public wxControl
class WXDLLEXPORT wxListBoxBase : public wxControlWithItems
{
public:
// ctor
wxListBoxBase() { m_clientDataItemsType = ClientData_None; }
// adding items
// ------------
void Append(const wxString& item)
{ DoAppend(item); }
void Append(const wxString& item, void *clientData)
{ int n = DoAppend(item); SetClientData(n, clientData); }
void Append(const wxString& item, wxClientData *clientData)
{ int n = DoAppend(item); SetClientObject(n, clientData); }
// all generic methods are in wxControlWithItems, except for the following
// ones which are not yet implemented by wxChoice/wxCombobox
void Insert(const wxString& item, int pos)
{ DoInsert(item, pos); }
@@ -71,57 +61,30 @@ public:
void Set(const wxArrayString& items, void **clientData = NULL)
{ DoSetItems(items, clientData); }
// deleting items
// --------------
virtual void Clear() = 0;
virtual void Delete(int n) = 0;
// accessing strings
// -----------------
virtual int GetCount() const = 0;
virtual wxString GetString(int n) const = 0;
virtual void SetString(int n, const wxString& s) = 0;
virtual int FindString(const wxString& s) const = 0;
// selection
// ---------
// multiple selection logic
virtual bool IsSelected(int n) const = 0;
virtual void SetSelection(int n, bool select = TRUE) = 0;
void Select(int n) { SetSelection(n, TRUE); }
virtual void Select(int n) { SetSelection(n, TRUE); }
void Deselect(int n) { SetSelection(n, FALSE); }
virtual int GetSelection() const = 0;
virtual bool SetStringSelection(const wxString& s, bool select = TRUE);
// works for single as well as multiple selection listboxes (unlike
// GetSelection which only works for listboxes with single selection)
virtual int GetSelections(wxArrayInt& aSelections) const = 0;
bool SetStringSelection(const wxString& s, bool select = TRUE);
wxString GetStringSelection() const;
// misc
// ----
// client data stuff
void SetClientData( int n, void* clientData );
void* GetClientData( int n ) const;
void SetClientObject( int n, wxClientData* clientData );
wxClientData* GetClientObject( int n ) const;
// Set the specified item at the first visible item or scroll to max
// range.
void SetFirstItem(int n) { DoSetFirstItem(n); }
void SetFirstItem(const wxString& s);
// emulate selecting or deselecting (depending on event.GetExtraLong())
// the item event.GetInt() from the control
virtual void Command(wxCommandEvent &event);
// emulate selecting or deselecting the item event.GetInt() (depending on
// event.GetExtraLong())
void Command(wxCommandEvent& event);
// compatibility - these functions are deprecated, use the new ones
// instead
bool Selected(int n) const { return IsSelected(n); }
int Number() const { return GetCount(); }
protected:
// NB: due to wxGTK implementation details, DoInsert() is implemented
@@ -130,29 +93,10 @@ protected:
{ InsertItems(1, &item, pos); }
// to be implemented in derived classes
virtual int DoAppend(const wxString& item) = 0;
virtual void DoInsertItems(const wxArrayString& items, int pos) = 0;
virtual void DoSetItems(const wxArrayString& items, void **clientData) = 0;
virtual void DoSetFirstItem(int n) = 0;
virtual void DoSetClientData(int n, void* clientData) = 0;
virtual void* DoGetClientData(int n) const = 0;
virtual void DoSetClientObject(int n, wxClientData* clientData) = 0;
virtual wxClientData* DoGetClientObject(int n) const = 0;
// the above pure virtuals hide these virtuals in wxWindowBase
virtual void DoSetClientData(void* clientData )
{ wxWindowBase::DoSetClientData(clientData); };
virtual void* DoGetClientData() const
{ return(wxWindowBase::DoGetClientData()); };
virtual void DoSetClientObject( wxClientData* clientData )
{ wxWindowBase::DoSetClientObject(clientData); };
virtual wxClientData* DoGetClientObject() const
{ return(wxWindowBase::DoGetClientObject()); };
// the type of the client data for the items
wxClientDataType m_clientDataItemsType;
};
// ----------------------------------------------------------------------------

9
include/wx/msw/choice.h
View File

@@ -60,16 +60,17 @@ public:
virtual int FindString(const wxString& s) const;
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& s);
// MSW only
virtual bool MSWCommand(WXUINT param, WXWORD id);
long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
protected:
virtual void DoSetClientData( int n, void* clientData );
virtual void* DoGetClientData( int n ) const;
virtual void DoSetClientObject( int n, wxClientData* clientData );
virtual wxClientData* DoGetClientObject( int n ) const;
virtual void DoSetItemClientData( int n, void* clientData );
virtual void* DoGetItemClientData( int n ) const;
virtual void DoSetItemClientObject( int n, wxClientData* clientData );
virtual wxClientData* DoGetItemClientObject( int n ) const;
// MSW implementation
virtual wxSize DoGetBestSize();

8
include/wx/msw/listbox.h
View File

@@ -82,10 +82,10 @@ public:
virtual void DoSetFirstItem(int n);
virtual void DoSetClientData(int n, void* clientData);
virtual void* DoGetClientData(int n) const;
virtual void DoSetClientObject(int n, wxClientData* clientData);
virtual wxClientData* DoGetClientObject(int n) const;
virtual void DoSetItemClientData(int n, void* clientData);
virtual void* DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject(int n, wxClientData* clientData);
virtual wxClientData* DoGetItemClientObject(int n) const;
// wxCheckListBox support
#if wxUSE_OWNER_DRAWN