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

« back to all changes in this revision

Viewing changes to src/msw/filedlg.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:
172
172
 
173
173
        case WM_NOTIFY:
174
174
            {
175
 
                OFNOTIFY* const
176
 
                    pNotifyCode = reinterpret_cast<OFNOTIFY *>(lParam);
177
 
                wxFileDialog* const
178
 
                    dialog = reinterpret_cast<wxFileDialog *>(
179
 
                                    pNotifyCode->lpOFN->lCustData
180
 
                                );
181
 
 
182
 
                switch ( pNotifyCode->hdr.code )
 
175
                NMHDR* const pNM = reinterpret_cast<NMHDR*>(lParam);
 
176
                if ( pNM->code > CDN_LAST && pNM->code <= CDN_FIRST )
183
177
                {
184
 
                    case CDN_INITDONE:
185
 
                        dialog->MSWOnInitDone((WXHWND)hDlg);
186
 
                        break;
187
 
 
188
 
                    case CDN_SELCHANGE:
189
 
                        dialog->MSWOnSelChange((WXHWND)hDlg);
190
 
                        break;
 
178
                    OFNOTIFY* const
 
179
                        pNotifyCode = reinterpret_cast<OFNOTIFY *>(lParam);
 
180
                    wxFileDialog* const
 
181
                        dialog = reinterpret_cast<wxFileDialog *>(
 
182
                                        pNotifyCode->lpOFN->lCustData
 
183
                                    );
 
184
 
 
185
                    switch ( pNotifyCode->hdr.code )
 
186
                    {
 
187
                        case CDN_INITDONE:
 
188
                            dialog->MSWOnInitDone((WXHWND)hDlg);
 
189
                            break;
 
190
 
 
191
                        case CDN_SELCHANGE:
 
192
                            dialog->MSWOnSelChange((WXHWND)hDlg);
 
193
                            break;
 
194
                    }
191
195
                }
192
196
            }
193
197
            break;