*** empty log message ***

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

diff --git a/include/wx/qt/control.h b/include/wx/qt/control.h
index 5aa8a1b39a41b2e06c728f6d14930904dc1221c6..5432b5c5e756e919830af86872aed69f18413bde 100644 (file)
--- a/include/wx/qt/control.h
+++ b/include/wx/qt/control.h
@@ -1,60 +1,50 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        control.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        control.h

-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Purpose:     wxControl class
+// Author:      AUTHOR
+// Modified by:
+// Created:     ??/??/98
+// RCS-ID:      $Id$
+// Copyright:   (c) AUTHOR

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GTKCONTROLH__
-#define __GTKCONTROLH__
+#ifndef _WX_CONTROL_H_
+#define _WX_CONTROL_H_

 
 #ifdef __GNUG__
 
 #ifdef __GNUG__

-#pragma interface
+#pragma interface "control.h"

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"

 #include "wx/window.h"
 #include "wx/window.h"

+#include "wx/list.h"
+#include "wx/validate.h"

 
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxControl;
+// General item class
+class WXDLLEXPORT wxControl: public wxWindow
+{
+  DECLARE_ABSTRACT_CLASS(wxControl)
+public:
+   wxControl();
+   ~wxControl();

 
 

-//-----------------------------------------------------------------------------
-// wxControl
-//-----------------------------------------------------------------------------
+   virtual void Command(wxCommandEvent& WXUNUSED(event)) = 0;        // 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 ;

 
 

-class wxControl: public wxWindow
-{
-DECLARE_DYNAMIC_CLASS(wxControl)
+   // 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

 
 

-public:
-  // construction
-  wxControl();
-  wxControl( wxWindow *parent, wxWindowID id, 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      long style = 0, const wxString &name = wxPanelNameStr  );
-  
-  // overridables
-  virtual void Command( wxCommandEvent &event );
-
-  // accessors
-    // this function will filter out '&' characters and will put the accelerator
-    // char (the one immediately after '&') into m_chAccel (@@ not yet)
-  virtual void SetLabel( const wxString &label );
-  virtual wxString GetLabel() const;
+   inline wxFunction GetCallback() { return m_callback; }

 
 protected:
 
 protected:

-  wxString   m_label;
-  // when we implement keyboard interface we will make use of this, but not yet
-  //char       m_chAccel;
+   wxFunction       m_callback;     // Callback associated with the window
+
+DECLARE_EVENT_TABLE()

 };
 
 };
 

-#endif // __GTKCONTROLH__
+#endif
+    // _WX_CONTROL_H_