Added size hints to dialog,

[wxWidgets.git] / src / gtk1 / control.cpp

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index 237f37d89f01dbd865970a4e1a5bc3e9e9318ed0..bbd5ac2fd8e5bd86b269943f5faea7df1eb7deb4 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -2,10 +2,9 @@
 // Name:        control.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        control.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -14,38 +13,48 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

+#include "gtk/gtkfeatures.h"
+

 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)

 
 

-wxControl::wxControl(void)
-{
-  m_label = "";
-  m_needParent = TRUE;
-};
-
-wxControl::wxControl( wxWindow *parent, wxWindowID id, 
-      const wxPoint &pos, const wxSize &size, 
-      long style, const wxString &name ) :
-  wxWindow( parent, id, pos, size, style, name )
+wxControl::wxControl()

 {
 {

-};
-
-void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
+    m_needParent = TRUE;
+}
+
+wxControl::wxControl( wxWindow *parent,
+                      wxWindowID id,
+                      const wxPoint &pos,
+                      const wxSize &size,
+                      long style,
+                      const wxString &name )

 {
 {

-};
+    (void)Create(parent, id, pos, size, style, name);
+}

 
 void wxControl::SetLabel( const wxString &label )
 {
 
 void wxControl::SetLabel( const wxString &label )
 {

-  m_label = label;
-};
+    m_label.Empty();
+    for ( const wxChar *pc = label; *pc != wxT('\0'); pc++ )
+    {
+        if ( *pc == wxT('&') )
+        {
+            pc++; // skip it
+#if 0 // it would be unused anyhow for now - kbd interface not done yet
+            if ( *pc != wxT('&') ) m_chAccel = *pc;
+#endif
+        }
+        m_label << *pc;
+    }
+}

 
 

-wxString wxControl::GetLabel(void) const
+wxString wxControl::GetLabel() const

 {
 {

-  return m_label;
-};
-
+    return m_label;
+}