deselect the current selection when the user clicks outside of any item

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

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index afcd65c371cddc79074d76b6718b2854bfdc17c3..8917ed25dba58b75e45e49ed741d80999a24f0e2 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        control.cpp
-// Purpose:
+// Name:        src/gtk1/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,19 +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/control.h"
 #include "wx/fontutil.h"
 #include "wx/settings.h"

+#include "wx/gtk1/private.h"

 
 

-#include <gtk/gtk.h>
+// ============================================================================
+// wxControl implementation
+// ============================================================================

 
 

-//-----------------------------------------------------------------------------
-// wxControl
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxControl creation
+// ----------------------------------------------------------------------------

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


@@ -40,7 +42,7 @@ bool wxControl::Create( wxWindow *parent,
                       const wxString &name )
 {
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);
                       const wxString &name )
 {
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);

-    
+

 #if wxUSE_VALIDATORS
     SetValidator(validator);
 #endif
 #if wxUSE_VALIDATORS
     SetValidator(validator);
 #endif


@@ -48,29 +50,6 @@ bool wxControl::Create( wxWindow *parent,
     return ret;
 }
 
     return ret;
 }
 

-void wxControl::SetLabel( const wxString &label )
-{
-    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 ( *pc != wxT('&') ) m_chAccel = *pc;
-#endif
-        }
-        m_label << *pc;
-    }
-    InvalidateBestSize();    
-}
-
-wxString wxControl::GetLabel() const
-{
-    return m_label;
-}
-
-

 wxSize wxControl::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...
 wxSize wxControl::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...


@@ -98,56 +77,87 @@ void wxControl::PostCreation(const wxSize& size)
     //     size. This call ensure that a style is available at the time
     //     GetBestSize is called.
     gtk_widget_ensure_style(m_widget);
     //     size. This call ensure that a style is available at the time
     //     GetBestSize is called.
     gtk_widget_ensure_style(m_widget);

-    
+

     ApplyWidgetStyle();
     SetInitialBestSize(size);
 }
 
     ApplyWidgetStyle();
     SetInitialBestSize(size);
 }
 

+// ----------------------------------------------------------------------------
+// wxControl dealing with labels
+// ----------------------------------------------------------------------------
+
+void wxControl::SetLabel( const wxString &label )
+{
+    // keep the original string internally to be able to return it later (for
+    // consistency with the other ports)
+    m_label = label;
+
+    InvalidateBestSize();
+}
+
+wxString wxControl::GetLabel() const
+{
+    return m_label;
+}
+
+void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label)
+{
+    // don't call the virtual function which might call this one back again
+    wxControl::SetLabel(label);
+
+    const wxString labelGTK = GTKRemoveMnemonics(label);
+
+    gtk_label_set(w, wxGTK_CONV(labelGTK));
+}

 
 

-#ifdef __WXGTK20__
-wxString wxControl::PrepareLabelMnemonics( const wxString &label ) const
+void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)

 {
 {

-    //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++)
+    wxControl::SetLabel(label);
+
+    const wxString labelGTK = GTKRemoveMnemonics(label);
+
+    gtk_frame_set_label(w, labelGTK.empty() ? (char *)NULL
+                                            : wxGTK_CONV(labelGTK));
+}
+
+/* static */
+wxString wxControl::GTKRemoveMnemonics(const wxString& label)
+{
+    const size_t len = label.length();
+    wxString labelGTK;
+    labelGTK.reserve(len);
+    for ( size_t i = 0; i < len; i++ )

     {
     {

-        if (label.GetChar(i) == wxT('&'))
+        wxChar ch = label[i];
+
+        if ( ch == _T('&') )

         {
         {

-            //Mnemonic escape sequence "&&" is a literal "&" in the output.
-            if (label.GetChar(i + 1) == wxT('&'))
+            if ( i == len - 1 )

             {
             {

-                label2 << wxT('&');
-                i++;
+                // "&" at the end of string is an error
+                wxLogDebug(wxT("Invalid label \"%s\"."), label.c_str());
+                break;

             }
             }

-            //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
+
+            ch = label[++i]; // skip '&' itself
+            if ( ch == _T('&') )

             {
             {

-                label2 << wxT('_');
+                // special case: "&&" is not a mnemonic at all but just an
+                // escaped "&"
+                labelGTK += wxT('&');
+                continue;

             }
         }
             }
         }

-        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);
-        }
+
+        labelGTK += ch;

     }
     }

-    return label2;
+
+    return labelGTK;

 }
 }

-#endif

 
 

+// ----------------------------------------------------------------------------
+// wxControl styles (a.k.a. attributes)
+// ----------------------------------------------------------------------------

 
 wxVisualAttributes wxControl::GetDefaultAttributes() const
 {
 
 wxVisualAttributes wxControl::GetDefaultAttributes() const
 {


@@ -178,7 +188,7 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
 
     if (state == -1)
         state = GTK_STATE_NORMAL;
 
     if (state == -1)
         state = GTK_STATE_NORMAL;

-        
+

     // get the style's colours
     attr.colFg = wxColour(style->fg[state].red   >> SHIFT,
                           style->fg[state].green >> SHIFT,
     // get the style's colours
     attr.colFg = wxColour(style->fg[state].red   >> SHIFT,
                           style->fg[state].green >> SHIFT,


@@ -193,34 +203,9 @@ 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 )
-    {  
-        wxNativeFontInfo info;  
-        info.description = pango_font_description_copy(style->font_desc);
-        attr.font = wxFont(info);  
-    }  
-    else  
-    {  
-        GtkSettings *settings = gtk_settings_get_default();
-        gchar *font_name = NULL;
-        g_object_get ( settings,
-                       "gtk-font-name", 
-                       &font_name,
-                       NULL);
-        if (!font_name)
-            attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
-        else
-            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 );
     // 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;
 }