* Fixed a memory leak in wxThread

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

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index fb7fd4d3af88ab1495cf85de0883c3c7ca456431..c9064a34136a0f241194ea2420e5b55e2fa0654c 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -2,9 +2,8 @@
 // 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
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin

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


@@ -23,21 +22,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
 wxControl::wxControl(void)
 {
   m_needParent = TRUE;
 wxControl::wxControl(void)
 {
   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( wxWindow *parent, wxWindowID id,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name ) :
   wxWindow( parent, id, pos, size, style, name )
 {

-};
+}

 
 void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
 {
 
 void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
 {

-};
+}

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

+  m_label = "";

   for ( const char *pc = label; *pc != '\0'; pc++ ) {
     if ( *pc == '&' ) {
       pc++; // skip it
   for ( const char *pc = label; *pc != '\0'; pc++ ) {
     if ( *pc == '&' ) {
       pc++; // skip it


@@ -47,15 +47,14 @@ void wxControl::SetLabel( const wxString &label )
 #endif
     }
 
 #endif
     }
 

-    m_label = "";

     m_label << *pc;
   }
     m_label << *pc;
   }

-};
+}

 
 wxString wxControl::GetLabel(void) const
 {
   return m_label;
 
 wxString wxControl::GetLabel(void) const
 {
   return m_label;

-};
+}