VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index e767eac88f3969030906664bbee9b954cafd90f9..bbd5ac2fd8e5bd86b269943f5faea7df1eb7deb4 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -19,7 +19,7 @@
 // wxControl
 //-----------------------------------------------------------------------------
 
 // wxControl
 //-----------------------------------------------------------------------------
 

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

 
 wxControl::wxControl()
 {
 
 wxControl::wxControl()
 {


@@ -32,27 +32,27 @@ wxControl::wxControl( wxWindow *parent,
                       const wxSize &size,
                       long style,
                       const wxString &name )
                       const wxSize &size,
                       long style,
                       const wxString &name )

-         : wxWindow( parent, id, pos, size, style, name )

 {
 {

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

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

-    m_label = _T("");
-    for ( const wxChar *pc = label; *pc != _T('\0'); pc++ )
+    m_label.Empty();
+    for ( const wxChar *pc = label; *pc != wxT('\0'); pc++ )

     {
     {

-        if ( *pc == _T('&') )
+        if ( *pc == wxT('&') )

         {
             pc++; // skip it
 #if 0 // it would be unused anyhow for now - kbd interface not done yet
         {
             pc++; // skip it
 #if 0 // it would be unused anyhow for now - kbd interface not done yet

-            if ( *pc != _T('&') ) m_chAccel = *pc;
+            if ( *pc != wxT('&') ) m_chAccel = *pc;

 #endif
         }
         m_label << *pc;
     }
 }
 
 #endif
         }
         m_label << *pc;
     }
 }
 

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

 {
     return m_label;
 }
 {
     return m_label;
 }