Merged some STC fixes over to the main branch

[wxWidgets.git] / src / qt / button.cpp

diff --git a/src/qt/button.cpp b/src/qt/button.cpp
index 438a4cfea19531b45b7096dd7f6fa59d3036ed23..2928e0d96f9254af3b908f782ce8d8631ab15247 100644 (file)
--- a/src/qt/button.cpp
+++ b/src/qt/button.cpp
@@ -1,10 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.cpp
-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Purpose:     wxButton
+// Author:      AUTHOR
+// Modified by:
+// Created:     ??/??/98
+// RCS-ID:      $Id$
+// Copyright:   (c) AUTHOR
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,48 +15,59 @@
 
 #include "wx/button.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 
-class wxButton;
+// Button
 
-//-----------------------------------------------------------------------------
-// wxButton
-//-----------------------------------------------------------------------------
+bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
+           const wxPoint& pos,
+           const wxSize& size, long style,
+           const wxValidator& validator,
+           const wxString& name)
+{
+    SetName(name);
+    SetValidator(validator);
+    m_windowStyle = style;
 
-IMPLEMENT_DYNAMIC_CLASS(wxButton,wxControl)
+    parent->AddChild((wxButton *)this);
 
-//-----------------------------------------------------------------------------
+    if (id == -1)
+        m_windowId = NewControlId();
+    else
+        m_windowId = id;
 
-wxButton::wxButton(void)
-{
-};
+    // TODO: create button
+
+    return FALSE;
+}
 
-wxButton::wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
 {
-  Create( parent, id, label, pos, size, style, name );
-};
+    // TODO
+}
 
-bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+void wxButton::SetDefault()
 {
-  return TRUE;
-};
+    wxWindow *parent = (wxWindow *)GetParent();
+    if (parent)
+        parent->SetDefaultItem(this);
 
-void wxButton::SetDefault(void)
+    // TODO: make button the default
+}
+
+wxString wxButton::GetLabel() const
 {
-};
+    // TODO
+    return wxString("");
+}
 
-void wxButton::SetLabel( const wxString &label )
+void wxButton::SetLabel(const wxString& label)
 {
-  wxControl::SetLabel( label );
-};
+    // TODO
+}
 
-wxString wxButton::GetLabel(void) const
+void wxButton::Command (wxCommandEvent & event)
 {
-  return wxControl::GetLabel();
-};
+    ProcessCommand (event);
+}
+