Listbox fixes

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

diff --git a/include/wx/mac/combobox.h b/include/wx/mac/combobox.h
index 4b10550e60f9de485e6962de3c56427c0a118c31..97e430d68afa2b04b52ad992d21ede3a077fb8ff 100644 (file)
--- a/include/wx/mac/combobox.h
+++ b/include/wx/mac/combobox.h
@@ -1,103 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.h
-// Purpose:     wxComboBox class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COMBOBOX_H_
-#define _WX_COMBOBOX_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "combobox.h"
-#endif
-
-#include "wx/textctrl.h"
-#include "wx/choice.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-
-// Combobox item
-class WXDLLEXPORT wxComboBox: public wxChoice
-{
-  DECLARE_DYNAMIC_CLASS(wxComboBox)
-
- public:
-  inline wxComboBox() {}
-    virtual ~wxComboBox();
-    // override the base class virtuals involved in geometry calculations
-    virtual wxSize DoGetBestSize() const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-
-    // forward these functions to all subcontrols
-    virtual bool Enable(bool enable = TRUE);
-    virtual bool Show(bool show = TRUE);
-    virtual void SetFocus();
-
-    // callback functions
-    virtual void DelegateTextChanged( const wxString& value );
-    virtual void DelegateChoice( const wxString& value );
-
-  inline wxComboBox(wxWindow *parent, wxWindowID id,
-           const wxString& value = wxEmptyString,
-           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 = wxComboBoxNameStr)
-  {
-    Create(parent, id, value, pos, size, n, choices, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxString& value = wxEmptyString,
-           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 = wxComboBoxNameStr);
-
-  // List functions
-  virtual void Append(const wxString& item);
-  virtual void Delete(int n);
-  virtual void Clear();
-  virtual int GetSelection() const ;
-  virtual void SetSelection(int n);
-  virtual int FindString(const wxString& s) const;
-  virtual wxString GetString(int n) const ;
-  virtual wxString GetStringSelection() const ;
-  virtual bool SetStringSelection(const wxString& sel);
-  
-  // Text field functions
-  virtual wxString GetValue() const ;
-  virtual void SetValue(const wxString& value);
-
-  // Clipboard operations
-  virtual void Copy();
-  virtual void Cut();
-  virtual void Paste();
-  virtual void SetInsertionPoint(long pos);
-  virtual void SetInsertionPointEnd();
-  virtual long GetInsertionPoint() const ;
-  virtual long GetLastPosition() const ;
-  virtual void Replace(long from, long to, const wxString& value);
-  virtual void Remove(long from, long to);
-  virtual void SetSelection(long from, long to);
-  virtual void SetEditable(bool editable);
-  virtual int GetCount() const { return m_choice->GetCount() ; }
-  void MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
-protected:
-    // the subcontrols
-    wxTextCtrl*     m_text;
-    wxChoice*       m_choice;
-};
-
-#endif
-    // _WX_COMBOBOX_H_
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/combobox.h"
+#else
+#include "wx/mac/carbon/combobox.h"
+#endif
\ No newline at end of file