From da7b3583d88236a8601bda8f2eb418f49b569fa7 Mon Sep 17 00:00:00 2001
From: "J. Russell Smyth" <drfish@cox.net>
Date: Wed, 17 Mar 1999 11:11:15 +0000
Subject: [PATCH] 1 - fixed listbox.cpp to work with events with
 m_commandString member as wxString (fixing to match recent change) 2 - made
 wxSystemSettings::GetSystemColour(wxSYS_COLOUR_GRAYTEXT) return better value

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/listbox.cpp   | 10 ++++------
 src/gtk/settings.cpp  |  2 +-
 src/gtk1/listbox.cpp  | 10 ++++------
 src/gtk1/settings.cpp |  2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 07b6eede12..6e98cf6ca5 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -96,17 +96,16 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
             event.m_commandInt = aSelections[0] ;
             event.m_clientData = listbox->GetClientData( event.m_commandInt );
             wxString str(listbox->GetString(event.m_commandInt));
-            if (str != "") event.m_commandString = copystring((char *)(const char *)str);
+            if (!str.IsEmpty()) event.m_commandString = str;
         }
         else
         {
             event.m_commandInt = -1 ;
-            event.m_commandString = copystring("") ;
+            event.m_commandString.Empty();
         }
 
         listbox->GetEventHandler()->ProcessEvent( event );
 
-        if (event.m_commandString) delete[] event.m_commandString ;
     }
 
     return FALSE;
@@ -157,18 +156,17 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
         event.m_commandInt = aSelections[0] ;
         event.m_clientData = listbox->GetClientData( event.m_commandInt );
         wxString str(listbox->GetString(event.m_commandInt));
-        if (str != "") event.m_commandString = copystring((char *)(const char *)str);
+        if (!str.IsEmpty()) event.m_commandString = str;
     }
     else
     {
         event.m_commandInt = -1 ;
-        event.m_commandString = copystring("") ;
+        event.m_commandString.Empty();
     }
 
     event.SetEventObject( listbox );
 
     listbox->GetEventHandler()->ProcessEvent( event );
-    if (event.m_commandString) delete[] event.m_commandString ;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 17bfe356ab..87e05bdc5e 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -97,6 +97,7 @@ wxColour wxSystemSettings::GetSystemColour( int index )
       }
       return *g_systemBtnFaceColour;
     }
+    case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNSHADOW:
     {
       GtkStyle *style = gtk_widget_get_default_style();
@@ -109,7 +110,6 @@ wxColour wxSystemSettings::GetSystemColour( int index )
       }
       return *g_systemBtnShadowColour;
     }
-    case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNHIGHLIGHT:
     {
       GtkStyle *style = gtk_widget_get_default_style();
diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 07b6eede12..6e98cf6ca5 100644
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -96,17 +96,16 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
             event.m_commandInt = aSelections[0] ;
             event.m_clientData = listbox->GetClientData( event.m_commandInt );
             wxString str(listbox->GetString(event.m_commandInt));
-            if (str != "") event.m_commandString = copystring((char *)(const char *)str);
+            if (!str.IsEmpty()) event.m_commandString = str;
         }
         else
         {
             event.m_commandInt = -1 ;
-            event.m_commandString = copystring("") ;
+            event.m_commandString.Empty();
         }
 
         listbox->GetEventHandler()->ProcessEvent( event );
 
-        if (event.m_commandString) delete[] event.m_commandString ;
     }
 
     return FALSE;
@@ -157,18 +156,17 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
         event.m_commandInt = aSelections[0] ;
         event.m_clientData = listbox->GetClientData( event.m_commandInt );
         wxString str(listbox->GetString(event.m_commandInt));
-        if (str != "") event.m_commandString = copystring((char *)(const char *)str);
+        if (!str.IsEmpty()) event.m_commandString = str;
     }
     else
     {
         event.m_commandInt = -1 ;
-        event.m_commandString = copystring("") ;
+        event.m_commandString.Empty();
     }
 
     event.SetEventObject( listbox );
 
     listbox->GetEventHandler()->ProcessEvent( event );
-    if (event.m_commandString) delete[] event.m_commandString ;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 17bfe356ab..87e05bdc5e 100644
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -97,6 +97,7 @@ wxColour wxSystemSettings::GetSystemColour( int index )
       }
       return *g_systemBtnFaceColour;
     }
+    case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNSHADOW:
     {
       GtkStyle *style = gtk_widget_get_default_style();
@@ -109,7 +110,6 @@ wxColour wxSystemSettings::GetSystemColour( int index )
       }
       return *g_systemBtnShadowColour;
     }
-    case wxSYS_COLOUR_GRAYTEXT:
     case wxSYS_COLOUR_BTNHIGHLIGHT:
     {
       GtkStyle *style = gtk_widget_get_default_style();
-- 
2.47.2