projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use wxUSE_* flags for new animation code.
[wxWidgets.git]
/
include
/
wx
/
choice.h
diff --git
a/include/wx/choice.h
b/include/wx/choice.h
index a99e477cd2336edcdd55fa5b03ace9da31f353fb..63f3267936f9e4457b97f472635b1efdd5559cff 100644
(file)
--- a/
include/wx/choice.h
+++ b/
include/wx/choice.h
@@
-5,7
+5,7
@@
// Modified by:
// Created: 26.07.99
// RCS-ID: $Id$
// Modified by:
// Created: 26.07.99
// RCS-ID: $Id$
-// Copyright: (c) wxWi
ndow
s team
+// Copyright: (c) wxWi
dget
s team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-16,9
+16,7
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #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
@@
-37,19
+35,12
@@
WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
{
public:
class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
{
public:
- // all generic methods are in wxControlWithItems
-#ifdef __DARWIN__
- virtual ~wxChoiceBase() {}
-#endif
-
- // single selection logic
- virtual void SetSelection(int n) = 0;
- virtual bool SetStringSelection(const wxString& s);
+ wxChoiceBase() { }
+ virtual ~wxChoiceBase();
- // don't override this
- virtual void Select(int n) { SetSelection(n); }
+ // all generic methods are in wxControlWithItems
- // set/get the number of columns in the control (as they're not supporte on
+ // set/get the number of columns in the control (as they're not supporte
d
on
// most platforms, they do nothing by default)
virtual void SetColumns(int WXUNUSED(n) = 1 ) { }
virtual int GetColumns() const { return 1 ; }
// most platforms, they do nothing by default)
virtual void SetColumns(int WXUNUSED(n) = 1 ) { }
virtual int GetColumns() const { return 1 ; }
@@
-57,26
+48,32
@@
public:
// emulate selecting the item event.GetInt()
void Command(wxCommandEvent& event);
// emulate selecting the item event.GetInt()
void Command(wxCommandEvent& event);
+private:
+ DECLARE_NO_COPY_CLASS(wxChoiceBase)
};
// ----------------------------------------------------------------------------
// include the platform-dependent class definition
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
// include the platform-dependent class definition
// ----------------------------------------------------------------------------
-#if defined(__WXMSW__)
+#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__)
#include "wx/motif/choice.h"
#include "wx/msw/choice.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/choice.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK
20
__)
#include "wx/gtk/choice.h"
#include "wx/gtk/choice.h"
-#elif defined(__WX
QT
__)
- #include "wx/
qt
/choice.h"
+#elif defined(__WX
GTK
__)
+ #include "wx/
gtk1
/choice.h"
#elif defined(__WXMAC__)
#include "wx/mac/choice.h"
#elif defined(__WXMAC__)
#include "wx/mac/choice.h"
+#elif defined(__WXCOCOA__)
+ #include "wx/cocoa/choice.h"
#elif defined(__WXPM__)
#include "wx/os2/choice.h"
#elif defined(__WXPM__)
#include "wx/os2/choice.h"
-#elif defined(__WXSTUBS__)
- #include "wx/stubs/choice.h"
#endif
#endif // wxUSE_CHOICE
#endif
#endif // wxUSE_CHOICE