~ubuntu-branches/ubuntu/wily/wxwidgets3.0/wily-proposed

« back to all changes in this revision

Viewing changes to src/gtk/combobox.cpp

  • Committer: Package Import Robot
  • Author(s): Olly Betts
  • Date: 2014-06-18 12:42:22 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20140618124222-y7t2vpsije1cesxy
Tags: 3.0.1-1
* New upstream release
  + Incorporates most of the patches we were carrying - only one left is:
    wx-config-conditionalise-webview-in-std.patch
* Drop versioning of dependencies from run-time libraries to wx-common -
  this will make the transition to the next wx version harder, and also
  makes backporting to wheezy more work.
* Mark -dbg packages as "Multi-Arch: same".
* Correct short descriptions of the webview packages to not just be
  copies of the corresponding media package's short description.
* Wrap 81 character line in package description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
278
278
GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const
279
279
{
280
280
#ifdef __WXGTK3__
281
 
    // no access to internal GdkWindows
282
 
    return NULL;
 
281
    GdkWindow* wxGTKFindWindow(GtkWidget* widget);
 
282
    return wxGTKFindWindow(GTK_WIDGET(GetEntry()));
283
283
#else
284
284
    return gtk_entry_get_text_window(GetEntry());
285
285
#endif