Ignore non-existant string selection in wxComboBox::SetValue() in read-only mode...

[wxWidgets.git] / src / motif / window.cpp

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 116998f5a8dc43889162539bf8588f6b213a1697..aca5e608d3587ba30cd5da1fa3e8225e7d7843c3 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -1083,7 +1083,6 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 
     menu->SetId(1); /* Mark as popped-up */
     menu->CreateMenu(NULL, widget, menu, 0);
 
     menu->SetId(1); /* Mark as popped-up */
     menu->CreateMenu(NULL, widget, menu, 0);

-    menu->SetInvokingWindow(this);

 
     menu->UpdateUI();
 
 
     menu->UpdateUI();
 


@@ -1478,10 +1477,11 @@ int wxWindow::GetCharWidth() const
     return width;
 }
 
     return width;
 }
 

-void wxWindow::GetTextExtent(const wxString& string,
-                             int *x, int *y,
-                             int *descent, int *externalLeading,
-                             const wxFont *theFont) const
+void wxWindow::DoGetTextExtent(const wxString& string,
+                               int *x, int *y,
+                               int *descent,
+                               int *externalLeading,
+                               const wxFont *theFont) const

 {
     const wxFont *fontToUse = theFont ? theFont : &m_font;
 
 {
     const wxFont *fontToUse = theFont ? theFont : &m_font;
 


@@ -2097,7 +2097,7 @@ static void wxScrollBarCallback(Widget scrollbar,
                                 XmScrollBarCallbackStruct *cbs)
 {
     wxWindow *win = wxGetWindowFromTable(scrollbar);
                                 XmScrollBarCallbackStruct *cbs)
 {
     wxWindow *win = wxGetWindowFromTable(scrollbar);

-    wxCHECK_RET( win, _T("invalid widget in scrollbar callback") );
+    wxCHECK_RET( win, wxT("invalid widget in scrollbar callback") );

 
     wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);
 
 
     wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);