Moved the check for page scrolling with the wheel into wxMouseEvent so

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

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index 658ebcd8c96e35313cb8e2349ee12c59f5a8677a..72e2da93ef4b857bc10f17ab66735f2cf17a6f3b 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -2,7 +2,7 @@
 // Name:        control.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        control.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $id$
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -11,50 +11,77 @@
 #pragma implementation "control.h"
 #endif
 
 #pragma implementation "control.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_CONTROLS
+

 #include "wx/control.h"
 
 #include "wx/control.h"
 

+#include <gtk/gtk.h>
+

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

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

 
 

-wxControl::wxControl(void)
+wxControl::wxControl()

 {
 {

-  m_needParent = TRUE;
+    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 )
+bool wxControl::Create( wxWindow *parent,
+                      wxWindowID id,
+                      const wxPoint &pos,
+                      const wxSize &size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString &name )

 {
 {

-}
+    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
+    
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif

 
 

-void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
-{
+    return ret;

 }
 
 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
+    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 0 // it would be unused anyhow for now - kbd interface not done yet

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

 #endif
 #endif

+        }
+        m_label << *pc;

     }
     }

-
-    m_label << *pc;
-  }

 }
 
 }
 

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

 {
 {

-  return m_label;
+    return m_label;

 }
 
 
 }
 
 

+wxSize wxControl::DoGetBestSize() const
+{
+    // Do not return any arbitrary default value...
+    wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
+
+    GtkRequisition req;
+    req.width = 2;
+    req.height = 2;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
+        (m_widget, &req );
+
+    return wxSize(req.width, req.height);
+}
+
+#endif // wxUSE_CONTROLS