Applied a few old patches,

  Changed dclick handling in wxFileDialog,
  Added cursor code to wxToolBar

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 5a6f17415dcdcec6781685ab80b6e1e6affbdc17..c7f755e53097ced57686ba6422c049e0fcee73d0 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -48,11 +48,7 @@ extern const wxChar *wxToolBarNameStr;
 
 class wxToolBar: public wxControl
 {
 
 class wxToolBar: public wxControl
 {

-  DECLARE_EVENT_TABLE()
-  DECLARE_DYNAMIC_CLASS(wxToolBar)
-  
-  public:
-
+public:

     wxToolBar(void);
     wxToolBar( wxWindow *parent, wxWindowID id, 
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     wxToolBar(void);
     wxToolBar( wxWindow *parent, wxWindowID id, 
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,


@@ -120,6 +116,12 @@ class wxToolBar: public wxControl
     int           m_xMargin;
     int           m_yMargin;
     bool          m_hasToolAlready;
     int           m_xMargin;
     int           m_yMargin;
     bool          m_hasToolAlready;

+    
+    void OnInternalIdle();
+    
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxToolBar)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h
index 5a6f17415dcdcec6781685ab80b6e1e6affbdc17..c7f755e53097ced57686ba6422c049e0fcee73d0 100644 (file)
--- a/include/wx/gtk1/tbargtk.h
+++ b/include/wx/gtk1/tbargtk.h
@@ -48,11 +48,7 @@ extern const wxChar *wxToolBarNameStr;
 
 class wxToolBar: public wxControl
 {
 
 class wxToolBar: public wxControl
 {

-  DECLARE_EVENT_TABLE()
-  DECLARE_DYNAMIC_CLASS(wxToolBar)
-  
-  public:
-
+public:

     wxToolBar(void);
     wxToolBar( wxWindow *parent, wxWindowID id, 
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     wxToolBar(void);
     wxToolBar( wxWindow *parent, wxWindowID id, 
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,


@@ -120,6 +116,12 @@ class wxToolBar: public wxControl
     int           m_xMargin;
     int           m_yMargin;
     bool          m_hasToolAlready;
     int           m_xMargin;
     int           m_yMargin;
     bool          m_hasToolAlready;

+    
+    void OnInternalIdle();
+    
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxToolBar)

 };
 
 #endif
 };
 
 #endif

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 703cf22cde968b831f0f522506ba24b866037b0c..f8d23ba8ef051b3d33e21bc2214aafc017e21dbe 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -812,12 +812,14 @@ void wxFileDialog::HandleAction( const wxString &fn )
     }
 
     SetPath( filename );
     }
 
     SetPath( filename );

+    
+    wxCommandEvent event;
+    wxDialog::OnOK(event);

 }
 
 void wxFileDialog::OnListOk( wxCommandEvent &event )
 {
     HandleAction( m_text->GetValue() );
 }
 
 void wxFileDialog::OnListOk( wxCommandEvent &event )
 {
     HandleAction( m_text->GetValue() );

-    event.Skip();

 }
 
 void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
 }
 
 void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 6c08581ae66b745e3270bcbd8d3cbfe344a15731..6e97994417b488e5b0f3ceed1ba43226ad3054c5 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -52,7 +52,7 @@ bool wxCheckListBox::IsChecked( int index ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 

-        wxString str = wxString(label->label,*wxConv_current);
+        wxString str = wxString(label->label,*wxConvCurrent);

 
         return (str[1] == _T('X'));
     }
 
         return (str[1] == _T('X'));
     }

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index d981ae99dd0c0bb2766bce429596d41ba839c5ef..c27795d42e69a14d8a2154df49908626647bbe10 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -1011,8 +1011,9 @@ void wxListBox::OnInternalIdle()
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 

-    if (m_widget->window && cursor.Ok() && m_currentGdkCursor != cursor)
+    if (GTK_WIDGET(m_list)->window && cursor.Ok() && m_currentGdkCursor != cursor)

     {
     {

+        wxCursor oldGdkCursor = m_currentGdkCursor;

         m_currentGdkCursor = cursor;
        
        gdk_window_set_cursor( GTK_WIDGET(m_list)->window, m_currentGdkCursor.GetCursor() );
         m_currentGdkCursor = cursor;
        
        gdk_window_set_cursor( GTK_WIDGET(m_list)->window, m_currentGdkCursor.GetCursor() );


@@ -1023,7 +1024,16 @@ void wxListBox::OnInternalIdle()
             GtkBin *bin = GTK_BIN( child->data );
             GtkWidget *label = GTK_WIDGET( bin->child );
            
             GtkBin *bin = GTK_BIN( child->data );
             GtkWidget *label = GTK_WIDGET( bin->child );
            

-           gdk_window_set_cursor( label->window, m_currentGdkCursor.GetCursor() );
+           if (!label->window)
+           {
+               /* windows not yet realized. come back later. */
+                m_currentGdkCursor = oldGdkCursor;
+               break;
+           }
+           else
+           {
+               gdk_window_set_cursor( label->window, m_currentGdkCursor.GetCursor() );
+           }

 
             child = child->next;
         }
 
             child = child->next;
         }

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 0f90b72a744d05b447935a8dd19d32b6f82c13cf..b3b92a7816a26c229f723303287e1a46ddf1a101 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -32,7 +32,8 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
+extern bool       g_blockEventsOnDrag;
+extern wxCursor   g_globalCursor;

 
 //-----------------------------------------------------------------------------
 // "clicked" (internal from gtk_toolbar)
 
 //-----------------------------------------------------------------------------
 // "clicked" (internal from gtk_toolbar)


@@ -598,4 +599,35 @@ void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) )
     }
 }
 
     }
 }
 

+void wxToolBar::OnInternalIdle()
+{
+    wxCursor cursor = m_cursor;
+    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+
+    if (cursor.Ok() && m_currentGdkCursor != cursor)
+    {
+        wxCursor oldGdkCursor = m_currentGdkCursor;
+        m_currentGdkCursor = cursor;
+       
+        wxNode *node = m_tools.First();
+       while (node)
+        {
+           wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+           if (!tool->m_item->window)
+           {
+               /* windows not yet realized. come back later. */
+                m_currentGdkCursor = oldGdkCursor;
+               break;
+           }
+           else
+           {
+               gdk_window_set_cursor( tool->m_item->window, m_currentGdkCursor.GetCursor() );
+           }
+           node = node->Next();
+        }
+    }
+
+    UpdateWindowUI();
+}
+

 #endif
 #endif

diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp
index 6c08581ae66b745e3270bcbd8d3cbfe344a15731..6e97994417b488e5b0f3ceed1ba43226ad3054c5 100644 (file)
--- a/src/gtk1/checklst.cpp
+++ b/src/gtk1/checklst.cpp
@@ -52,7 +52,7 @@ bool wxCheckListBox::IsChecked( int index ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 

-        wxString str = wxString(label->label,*wxConv_current);
+        wxString str = wxString(label->label,*wxConvCurrent);

 
         return (str[1] == _T('X'));
     }
 
         return (str[1] == _T('X'));
     }

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index d981ae99dd0c0bb2766bce429596d41ba839c5ef..c27795d42e69a14d8a2154df49908626647bbe10 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -1011,8 +1011,9 @@ void wxListBox::OnInternalIdle()
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 

-    if (m_widget->window && cursor.Ok() && m_currentGdkCursor != cursor)
+    if (GTK_WIDGET(m_list)->window && cursor.Ok() && m_currentGdkCursor != cursor)

     {
     {

+        wxCursor oldGdkCursor = m_currentGdkCursor;

         m_currentGdkCursor = cursor;
        
        gdk_window_set_cursor( GTK_WIDGET(m_list)->window, m_currentGdkCursor.GetCursor() );
         m_currentGdkCursor = cursor;
        
        gdk_window_set_cursor( GTK_WIDGET(m_list)->window, m_currentGdkCursor.GetCursor() );


@@ -1023,7 +1024,16 @@ void wxListBox::OnInternalIdle()
             GtkBin *bin = GTK_BIN( child->data );
             GtkWidget *label = GTK_WIDGET( bin->child );
            
             GtkBin *bin = GTK_BIN( child->data );
             GtkWidget *label = GTK_WIDGET( bin->child );
            

-           gdk_window_set_cursor( label->window, m_currentGdkCursor.GetCursor() );
+           if (!label->window)
+           {
+               /* windows not yet realized. come back later. */
+                m_currentGdkCursor = oldGdkCursor;
+               break;
+           }
+           else
+           {
+               gdk_window_set_cursor( label->window, m_currentGdkCursor.GetCursor() );
+           }

 
             child = child->next;
         }
 
             child = child->next;
         }

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index 0f90b72a744d05b447935a8dd19d32b6f82c13cf..b3b92a7816a26c229f723303287e1a46ddf1a101 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -32,7 +32,8 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
+extern bool       g_blockEventsOnDrag;
+extern wxCursor   g_globalCursor;

 
 //-----------------------------------------------------------------------------
 // "clicked" (internal from gtk_toolbar)
 
 //-----------------------------------------------------------------------------
 // "clicked" (internal from gtk_toolbar)


@@ -598,4 +599,35 @@ void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) )
     }
 }
 
     }
 }
 

+void wxToolBar::OnInternalIdle()
+{
+    wxCursor cursor = m_cursor;
+    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+
+    if (cursor.Ok() && m_currentGdkCursor != cursor)
+    {
+        wxCursor oldGdkCursor = m_currentGdkCursor;
+        m_currentGdkCursor = cursor;
+       
+        wxNode *node = m_tools.First();
+       while (node)
+        {
+           wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+           if (!tool->m_item->window)
+           {
+               /* windows not yet realized. come back later. */
+                m_currentGdkCursor = oldGdkCursor;
+               break;
+           }
+           else
+           {
+               gdk_window_set_cursor( tool->m_item->window, m_currentGdkCursor.GetCursor() );
+           }
+           node = node->Next();
+        }
+    }
+
+    UpdateWindowUI();
+}
+

 #endif
 #endif

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index fb7f6cf871fe802885ce513e9dac4bbd51c5b1e5..9379ddd1d9231a873d050c16feeba6ba5049820e 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -564,7 +564,7 @@ bool wxHtmlSearchStatus::Search()
            if (m_Engine.Scan(file -> GetStream())) {
                m_Name = m_Data->m_Contents[i].m_Name;
                m_ContentsItem = m_Data->m_Contents + i;
            if (m_Engine.Scan(file -> GetStream())) {
                m_Name = m_Data->m_Contents[i].m_Name;
                m_ContentsItem = m_Data->m_Contents + i;

-               found = true;
+               found = TRUE;

            }
        }
        delete file;
            }
        }
        delete file;