Fixed bug #1022383: 'several ComboBoxes appear selected'

[wxWidgets.git] / include / wx / mac / listbox.h

diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h
index 0ab770ac57165df0865e548b05a0e5cf600716a9..a51668a18833e26c28fcc764adbf643344513860 100644 (file)
--- a/include/wx/mac/listbox.h
+++ b/include/wx/mac/listbox.h
@@ -1,124 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        listbox.h
-// Purpose:     wxListBox class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_LISTBOX_H_
-#define _WX_LISTBOX_H_
-
-#ifdef __GNUG__
-#pragma interface "listbox.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/listbox.h"
+#else
+#include "wx/mac/carbon/listbox.h"

 #endif
 #endif

-
-#include "wx/control.h"
-#include "wx/dynarray.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
-
-// forward decl for GetSelections()
-class WXDLLEXPORT wxArrayInt;
-
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-
-// List box item
-
-WX_DEFINE_ARRAY( char * , wxListDataArray ) ;
-
-class WXDLLEXPORT wxListBox: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxListBox)
- public:
-
-  wxListBox();
-  inline wxListBox(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxListBoxNameStr)
-  {
-    Create(parent, id, pos, size, n, choices, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxListBoxNameStr);
-
-  ~wxListBox();
-
-  virtual void Append(const wxString& item);
-  virtual void Append(const wxString& item, char *clientData);
-  virtual void Set(int n, const wxString* choices, char **clientData = NULL);
-  virtual int FindString(const wxString& s) const ;
-  virtual void Clear();
-  virtual void SetSelection(int n, bool select = TRUE);
-
-  virtual void Deselect(int n);
-
-  // For single choice list item only
-  virtual int GetSelection() const ;
-  virtual void Delete(int n);
-  virtual char *GetClientData(int n) const ;
-  virtual void SetClientData(int n, char *clientData);
-  virtual void SetString(int n, const wxString& s);
-
-  // For single or multiple choice list item
-  virtual int GetSelections(wxArrayInt& aSelections) const;
-  virtual bool Selected(int n) const ;
-  virtual wxString GetString(int n) const ;
-
-  // Set the specified item at the first visible item
-  // or scroll to max range.
-  virtual void SetFirstItem(int n) ;
-  virtual void SetFirstItem(const wxString& s) ;
-
-  virtual void InsertItems(int nItems, const wxString items[], int pos);
-
-  virtual wxString GetStringSelection() const ;
-  virtual bool SetStringSelection(const wxString& s, bool flag = TRUE);
-  virtual int Number() const ;
-
-  void Command(wxCommandEvent& event);
-
-       void MacSetRedraw( bool doDraw ) ;
- protected:
-  int       m_noItems;
-  int       m_selected;
-  
-       void                    MacDestroy() ;                  
-       void                    MacDelete( int n ) ;
-       void                    MacInsert( int n , const char * text) ;
-       void                    MacAppend( const char * text) ;
-       void                    MacSet( int n , const char *text ) ;
-       void                    MacClear() ;
-       void                    MacSetSelection( int n , bool select ) ;
-       int                     MacGetSelection() const ;
-       int                             MacGetSelections(wxArrayInt& aSelections) const ;
-       bool                    MacIsSelected( int n ) const ;
-       void                    MacScrollTo( int n ) ;
-       void                    OnSize( const wxSizeEvent &size ) ;
-       void                    MacDoClick() ;
-       void                    MacDoDoubleClick() ;
-
- public :
-  ListHandle   m_macList ;
-       wxArrayString m_stringArray ;
-       wxListDataArray m_dataArray ;
-       
-    virtual void       MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
-DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_LISTBOX_H_