Removed unused and outdated Watcom build files.

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 735fdd924f6df29d125d0cc3903bc34088eb0abb..921820d4275eab3864061c3473d9279c16a66db0 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        control.cpp
-// Purpose:
+// Name:        src/gtk/control.cpp
+// Purpose:     wxControl implementation for wxGTK

 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin


@@ -10,18 +10,21 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #if wxUSE_CONTROLS
 
 #if wxUSE_CONTROLS
 

+#include "wx/log.h"

 #include "wx/control.h"
 #include "wx/fontutil.h"
 #include "wx/settings.h"
 #include "wx/gtk/private.h"
 
 #include "wx/control.h"
 #include "wx/fontutil.h"
 #include "wx/settings.h"
 #include "wx/gtk/private.h"
 

-//-----------------------------------------------------------------------------
-// wxControl
-//-----------------------------------------------------------------------------
+// ============================================================================
+// wxControl implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxControl creation
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
 


@@ -104,11 +107,7 @@ void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label)
 
     const wxString labelGTK = GTKConvertMnemonics(label);
 
 
     const wxString labelGTK = GTKConvertMnemonics(label);
 

-#ifdef __WXGTK20__

     gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK));
     gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK));

-#else
-    gtk_label_set(w, wxGTK_CONV(labelGTK));
-#endif

 }
 
 void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)
 }
 
 void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)


@@ -256,7 +255,6 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
                               style->bg[state].blue  >> SHIFT);
 
     // get the style's font
                               style->bg[state].blue  >> SHIFT);
 
     // get the style's font

-#ifdef __WXGTK20__

     if ( !style->font_desc )
         style = gtk_widget_get_default_style();
     if ( style && style->font_desc )
     if ( !style->font_desc )
         style = gtk_widget_get_default_style();
     if ( style && style->font_desc )


@@ -279,10 +277,6 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
             attr.font = wxFont(wxString::FromAscii(font_name));
         g_free (font_name);
     }
             attr.font = wxFont(wxString::FromAscii(font_name));
         g_free (font_name);
     }

-#else
-    // TODO: isn't there a way to get a standard gtk 1.2 font?
-    attr.font = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
-#endif

 
     return attr;
 }
 
     return attr;
 }