make it non mach-o carbon savvy

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

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index a122f95f3787de5c490d02a646f515b0dedcdad7..d15a2b631ad7365cec8a2ad0eaa9ccc7849cc297 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -1,105 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        choice.h
-// Purpose:     wxChoice class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CHOICE_H_
-#define _WX_CHOICE_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "choice.h"
-#endif
-
-#include "wx/control.h"
-
-  #include  "wx/dynarray.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
-
-WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
-
-// Choice item
-class WXDLLEXPORT wxChoice: public wxChoiceBase
-{
-    DECLARE_DYNAMIC_CLASS(wxChoice)
-
-public:
-    wxChoice()
-        : m_strings(), m_datas(), m_macPopUpMenuHandle(NULL)
-        {}
-    
-    virtual ~wxChoice() ;
-
-  wxChoice(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 = wxChoiceNameStr)
-  {
-    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 = wxChoiceNameStr);
-
-  // implement base class pure virtuals
-  virtual int DoAppend(const wxString& item);
-  virtual void Delete(int n);
-  virtual void Clear();
-
-  virtual int GetCount() const ;
-  virtual int GetSelection() const ;
-  virtual void SetSelection(int n);
-
-  virtual int FindString(const wxString& s) const;
-  virtual wxString GetString(int n) const ;
-  virtual void SetString( int , const wxString& s ) ;
-       void            MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
-
-/*
-  virtual void Append(const wxString& item);
-  // Added min Append and GetClientData
-  virtual void Append(const wxString& item, void *client_data);
-  virtual void *GetClientData(int index) const;
-  virtual inline void Select( int n ) { SetSelection( n ); }
-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  virtual wxString GetStringSelection() const ;
-  virtual bool SetStringSelection(const wxString& sel);
-
-  // Mac specific
-  virtual void Command(wxCommandEvent& event);
-  void         MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
-
-  virtual inline int GetColumns() const { return 1 ; };
-*/
-protected:
-    virtual wxSize DoGetBestSize() const ;
-    virtual void DoSetItemClientData( int n, void* clientData );
-    virtual void* DoGetItemClientData( int n ) const;
-    virtual void DoSetItemClientObject( int n, wxClientData* clientData );
-    virtual wxClientData* DoGetItemClientObject( int n ) const;
-
-    // free all memory we have (used by Clear() and dtor)
-    // prevent collision with some BSD definitions of macro Free()   
-    void FreeData();
-
-  wxArrayString m_strings;
-  wxChoiceDataArray m_datas ;
-  WXHMENU      m_macPopUpMenuHandle ;
-};
-
-#endif
-       // _WX_CHOICE_H_
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/choice.h"
+#else
+#include "wx/mac/carbon/choice.h"
+#endif
\ No newline at end of file