make wxTmemchr() return (and take) char* instead of void* in ANSI build too

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

diff --git a/include/wx/mac/radiobox.h b/include/wx/mac/radiobox.h
index 5e0f3644e07d87d388c9f0d2e42e4f6553b7bb45..752554dff0e5b3c780edb76857b42230f0074965 100644 (file)
--- a/include/wx/mac/radiobox.h
+++ b/include/wx/mac/radiobox.h
@@ -1,92 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        radiobox.h
-// Purpose:     wxRadioBox class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RADIOBOX_H_
-#define _WX_RADIOBOX_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "radiobox.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/radiobox.h"
+#else
+#include "wx/mac/carbon/radiobox.h"

 #endif
 #endif

-
-// List box item
-class WXDLLEXPORT wxBitmap ;
-
-class WXDLLEXPORT wxRadioButton ;
-
-class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase
-{
-       DECLARE_DYNAMIC_CLASS(wxRadioBox)
-public:
-// Constructors & destructor
-       wxRadioBox();
-       inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
-             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = NULL,
-             int majorDim = 0, long style = wxRA_HORIZONTAL,
-             const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
-               {
-                       Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
-               }
-       ~wxRadioBox();
-       bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
-             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = NULL,
-             int majorDim = 0, long style = wxRA_HORIZONTAL,
-             const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
-
-// Specific functions (in wxWindows2 reference)
-       virtual void SetSelection(int item);
-       virtual int GetSelection() const;
-       
-       inline virtual int GetCount() const { return m_noItems; } ;
-
-       virtual wxString GetString(int item) const;
-       virtual void SetString(int item, const wxString& label) ;
-       
-       virtual void Enable(int item, bool enable);
-       virtual void Show(int item, bool show) ;
-
-    virtual int GetColumnCount() const ;
-    virtual int GetRowCount() const ;
-
-
-       virtual bool Enable(bool enable = TRUE);
-       virtual wxString GetLabel() const;
-       virtual void SetLabel(const wxString& label) ;
-       virtual bool Show(bool show = TRUE);
-
-// Other external functions 
-       void Command(wxCommandEvent& event);
-       void SetFocus();
-
-// Other variable access functions
-       inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
-       inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
-
-       void OnRadioButton( wxCommandEvent& event ) ;
-protected:
-       wxRadioButton           *m_radioButtonCycle;
-       
-       int               m_majorDim ;
-       int               m_noItems;
-       int               m_noRowsOrCols;
-
-// Internal functions 
-    virtual wxSize DoGetBestSize() const ;
-       virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_RADIOBOX_H_