added support for wxCAL_SHOW_WEEK_NUMBERS to generic version of wxCalendarCtrl (...

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

diff --git a/include/wx/osx/control.h b/include/wx/osx/control.h
index e98814a856e9420755720825ddc0f392f96710c3..123ab775547cf2d31616f5076cfaf71a7c82f666 100644 (file)
--- a/include/wx/osx/control.h
+++ b/include/wx/osx/control.h
@@ -1,5 +1,52 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/control.h"
-#else
-#include "wx/mac/carbon/control.h"
+/////////////////////////////////////////////////////////////////////////////
+// Name:        control.h
+// Purpose:     wxControl class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_CONTROL_H_
+#define _WX_CONTROL_H_
+
+WXDLLIMPEXP_DATA_CORE(extern const char) wxControlNameStr[];
+
+// General item class
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase
+{
+    DECLARE_ABSTRACT_CLASS(wxControl)
+
+public:
+   wxControl();
+   wxControl(wxWindow *parent, wxWindowID winid,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize, long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxControlNameStr)
+    {
+        Create(parent, winid, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID winid,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxControlNameStr);
+
+   // Simulates an event
+   virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
+
+   // implementation from now on
+   // --------------------------
+
+   // Calls the callback and appropriate event handlers
+   bool ProcessCommand(wxCommandEvent& event);
+
+   void                 OnKeyDown( wxKeyEvent &event ) ;
+};
+

 #endif
 #endif

+    // _WX_CONTROL_H_