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

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

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index c75756a72a8a1016db8278654a291232f390f445..e98814a856e9420755720825ddc0f392f96710c3 100644 (file)
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -1,50 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        control.h
-// Purpose:     wxControl class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CONTROL_H_
-#define _WX_CONTROL_H_
-
-#ifdef __GNUG__
-#pragma interface "control.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/control.h"
+#else
+#include "wx/mac/carbon/control.h"
 #endif
-
-#include "wx/window.h"
-#include "wx/list.h"
-#include "wx/validate.h"
-
-// General item class
-class WXDLLEXPORT wxControl: public wxWindow
-{
-  DECLARE_ABSTRACT_CLASS(wxControl)
-public:
-   wxControl();
-   ~wxControl();
-
-   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};        // Simulates an event
-   virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and
-                                                                 // appropriate event handlers
-   virtual void SetLabel(const wxString& label);
-   virtual wxString GetLabel() const ;
-
-   // Places item in centre of panel - so can't be used BEFORE panel->Fit()
-   void Centre(int direction = wxHORIZONTAL);
-   inline void Callback(const wxFunction function) { m_callback = function; }; // Adds callback
-
-   inline wxFunction GetCallback() { return m_callback; }
-
-protected:
-   wxFunction       m_callback;     // Callback associated with the window
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_CONTROL_H_