projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed GTKConvertMnemonics() which is not used in GTK1 (which doesn't support mnemonics)
[wxWidgets.git]
/
include
/
wx
/
gtk
/
choice.h
diff --git
a/include/wx/gtk/choice.h
b/include/wx/gtk/choice.h
index 17ae9edeb229e2e666aa8fdddb7a96d6014656d4..5b0526a275934749668a4025be8b9649bbfb9aea 100644
(file)
--- a/
include/wx/gtk/choice.h
+++ b/
include/wx/gtk/choice.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: choice.h
+// Name:
wx/gtk/
choice.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-10,10
+10,6
@@
#ifndef __GTKCHOICEH__
#define __GTKCHOICEH__
#ifndef __GTKCHOICEH__
#define __GTKCHOICEH__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "choice.h"
-#endif
-
class WXDLLIMPEXP_BASE wxSortedArrayString;
class WXDLLIMPEXP_BASE wxArrayString;
class WXDLLIMPEXP_BASE wxSortedArrayString;
class WXDLLIMPEXP_BASE wxArrayString;
@@
-21,7
+17,7
@@
class WXDLLIMPEXP_BASE wxArrayString;
// wxChoice
//-----------------------------------------------------------------------------
// wxChoice
//-----------------------------------------------------------------------------
-class wxChoice : public wxChoiceBase
+class
WXDLLIMPEXP_CORE
wxChoice : public wxChoiceBase
{
public:
wxChoice();
{
public:
wxChoice();
@@
-70,10
+66,11
@@
public:
void Clear();
int GetSelection() const;
void Clear();
int GetSelection() const;
+ int GetCurrentSelection() const { return GetSelection(); }
void SetSelection( int n );
virtual int GetCount() const;
void SetSelection( int n );
virtual int GetCount() const;
-
int FindString( const wxString& string
) const;
+
virtual int FindString(const wxString& s, bool bCase = false
) const;
wxString GetString( int n ) const;
void SetString( int n, const wxString& string );
wxString GetString( int n ) const;
void SetString( int n, const wxString& string );
@@
-83,7
+80,7
@@
public:
protected:
wxList m_clientList; // contains the client data for the items
protected:
wxList m_clientList; // contains the client data for the items
- void
ApplyWidgetStyle(
);
+ void
DoApplyWidgetStyle(GtkRcStyle *style
);
virtual int DoAppend(const wxString& item);
virtual int DoInsert(const wxString& item, int pos);
virtual int DoAppend(const wxString& item);
virtual int DoInsert(const wxString& item, int pos);
@@
-104,6
+101,12
@@
private:
// allocate it if it's needed (hence using pointer)
wxSortedArrayString *m_strings;
// allocate it if it's needed (hence using pointer)
wxSortedArrayString *m_strings;
+public:
+ // this circumvents a GTK+ 2.0 bug so that the selection is
+ // invalidated properly
+ int m_selection_hack;
+
+private:
DECLARE_DYNAMIC_CLASS(wxChoice)
};
DECLARE_DYNAMIC_CLASS(wxChoice)
};