rtti api mods added

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index c9064a34136a0f241194ea2420e5b55e2fa0654c..82f10af912671f0dd764b08a1f974f23e050bb29 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -7,54 +7,128 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "control.h"
 #endif
 
 #pragma implementation "control.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#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() const
+{
+    return m_label;

 }
 
 }
 

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

 {
 {

-  return m_label;
+    // 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);

 }
 
 }
 

+#ifdef __WXGTK20__
+wxString wxControl::PrepareLabelMnemonics( const wxString &label ) const
+{
+    //Format mnemonics properly for GTK2. This can be called from GTK1.x, but
+    //it's not very useful because mnemonics don't exist prior to GTK2.
+    wxString label2;
+    for (size_t i = 0; i < label.Len(); i++)
+    {
+        if (label.GetChar(i) == wxT('&'))
+        {
+            //Mnemonic escape sequence "&&" is a literal "&" in the output.
+            if (label.GetChar(i + 1) == wxT('&'))
+            {
+                label2 << wxT('&');
+                i++;
+            }
+            //Handle special case of "&_" (i.e. "_" is the mnemonic).
+            //FIXME - Is it possible to use "_" as a GTK mnemonic? Just use a
+            //dash for now.
+            else if (label.GetChar(i + 1) == wxT('_'))
+            {
+                label2 << wxT("_-");
+                i++;
+            }
+            //Replace WX mnemonic indicator "&" with GTK indicator "_".
+            else
+            {
+                label2 << wxT('_');
+            }
+        }
+        else if (label.GetChar(i) == wxT('_'))
+        {
+            //Escape any underlines in the string so GTK doesn't use them.
+            label2 << wxT("__");
+        }
+        else
+        {
+            label2 << label.GetChar(i);
+        }
+    }
+    return label2;
+}
+#endif

 
 

+#endif // wxUSE_CONTROLS