Resolved CVS conflict

[wxWidgets.git] / include / wx / choice.h

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 5a421268ed8617bf01e0cf3a4d6360ae921b01ff..ea08445c753215d5aca0bb996c5fbedd2cab96ea 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -1,13 +1,84 @@
-#ifndef __CHOICEH_BASE__
-#define __CHOICEH_BASE__
-
-#if defined(__WINDOWS__)
-#include "wx/msw/choice.h"
-#elif defined(__MOTIF__)
-#include "wx/xt/choice.h"
-#elif defined(__GTK__)
-#include "wx/gtk/choice.h"
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/choice.h
+// Purpose:     wxChoice class interface
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     26.07.99
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_CHOICE_H_BASE_
+#define _WX_CHOICE_H_BASE_
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "choicebase.h"
+#endif
+
+#include "wx/defs.h"
+
+#if wxUSE_CHOICE
+
+#include "wx/ctrlsub.h"     // the base class
+
+// ----------------------------------------------------------------------------
+// global data
+// ----------------------------------------------------------------------------
+
+extern WXDLLEXPORT_DATA(const wxChar*) wxChoiceNameStr;
+
+// ----------------------------------------------------------------------------
+// wxChoice allows to select one of a non-modifiable list of strings
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
+{
+public:
+    wxChoiceBase() { }
+    virtual ~wxChoiceBase();
+
+    // all generic methods are in wxControlWithItems
+
+    // 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 ) { }
+    virtual int GetColumns() const { return 1 ; }
+
+    // emulate selecting the item event.GetInt()
+    void Command(wxCommandEvent& event);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxChoiceBase)
+};
+
+// ----------------------------------------------------------------------------
+// include the platform-dependent class definition
+// ----------------------------------------------------------------------------
+
+#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"
+#elif defined(__WXGTK__)
+    #include "wx/gtk/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"
 #endif
 
+#endif // wxUSE_CHOICE
+
 #endif
-    // __CHOICEH_BASE__
+    // _WX_CHOICE_H_BASE_