← Back to branch summary

~ubuntu-branches/ubuntu/maverick/poedit/maverick

« back to all changes in this revision

Viewing changes to build/wx-2.8.7-msw-clipboard-events.patch

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2008-09-16 19:47:00 UTC
  • mfrom: (0.2.9 upstream) (1.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20080916194700-ueyef0pgklk3u50k
Tags: 1.4.2-2
Adding debug package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
build/wx-2.8.7-msw-clipboard-events.patch
 
1
--- src/msw/textctrl.cpp        2008/02/02 12:22:21     51503
 
2
+++ src/msw/textctrl.cpp        2008/02/02 14:07:19     51504
 
3
@@ -1968,6 +1968,19 @@
 
4
 
 
5
 WXLRESULT wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 
6
 {
 
7
+    // we must handle clipboard events before calling MSWWindowProc, otherwise
 
8
+    // the event would be handled twice if there's a handler for it in user
 
9
+    // code:
 
10
+    switch ( nMsg )
 
11
+    {
 
12
+        case WM_CUT:
 
13
+        case WM_COPY:
 
14
+        case WM_PASTE:
 
15
+            if ( HandleClipboardEvent(nMsg) )
 
16
+                return 0;
 
17
+            break;
 
18
+    }
 
19
+
 
20
     WXLRESULT lRc = wxTextCtrlBase::MSWWindowProc(nMsg, wParam, lParam);
 
21
 
 
22
     switch ( nMsg )
 
23
@@ -2010,13 +2023,6 @@
 
24
                 }
 
25
             }
 
26
             break;
 
27
-
 
28
-        case WM_CUT:
 
29
-        case WM_COPY:
 
30
-        case WM_PASTE:
 
31
-            if ( HandleClipboardEvent(nMsg) )
 
32
-                lRc = 0;
 
33
-            break;
 
34
     }
 
35
 
 
36
     return lRc;