projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduced unnecessary painting; delete/recreate caret as WIN32 requires
[wxWidgets.git]
/
include
/
wx
/
choice.h
diff --git
a/include/wx/choice.h
b/include/wx/choice.h
index 78a678d7f4e36d91b707680adc844432c371779f..a594dba58e15868eb60ae1036d4eda29d5958480 100644
(file)
--- a/
include/wx/choice.h
+++ b/
include/wx/choice.h
@@
-6,7
+6,7
@@
// Created: 26.07.99
// RCS-ID: $Id$
// Copyright: (c) wxWidgets team
// Created: 26.07.99
// RCS-ID: $Id$
// Copyright: (c) wxWidgets team
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CHOICE_H_BASE_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CHOICE_H_BASE_
@@
-16,9
+16,7
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "choicebase.h"
-#endif
+#include "wx/defs.h"
#if wxUSE_CHOICE
#if wxUSE_CHOICE
@@
-28,7
+26,7
@@
// global data
// ----------------------------------------------------------------------------
// global data
// ----------------------------------------------------------------------------
-
WXDLLEXPORT_DATA(extern
const wxChar*) wxChoiceNameStr;
+
extern WXDLLEXPORT_DATA(
const wxChar*) wxChoiceNameStr;
// ----------------------------------------------------------------------------
// wxChoice allows to select one of a non-modifiable list of strings
// ----------------------------------------------------------------------------
// wxChoice allows to select one of a non-modifiable list of strings
@@
-42,13
+40,6
@@
public:
// all generic methods are in wxControlWithItems
// all generic methods are in wxControlWithItems
- // single selection logic
- virtual void SetSelection(int n) = 0;
- virtual bool SetStringSelection(const wxString& s);
-
- // don't override this
- virtual void Select(int n) { SetSelection(n); }
-
// set/get the number of columns in the control (as they're not supported on
// most platforms, they do nothing by default)
virtual void SetColumns(int WXUNUSED(n) = 1 ) { }
// set/get the number of columns in the control (as they're not supported on
// most platforms, they do nothing by default)
virtual void SetColumns(int WXUNUSED(n) = 1 ) { }
@@
-67,6
+58,8
@@
private:
#if defined(__WXUNIVERSAL__)
#include "wx/univ/choice.h"
#if defined(__WXUNIVERSAL__)
#include "wx/univ/choice.h"
+#elif defined(__SMARTPHONE__) && defined(__WXWINCE__)
+ #include "wx/msw/wince/choicece.h"
#elif defined(__WXMSW__)
#include "wx/msw/choice.h"
#elif defined(__WXMOTIF__)
#elif defined(__WXMSW__)
#include "wx/msw/choice.h"
#elif defined(__WXMOTIF__)