OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "views/widget/widget_win.h" | 5 #include "views/widget/widget_win.h" |
6 | 6 |
7 #include "app/gfx/canvas.h" | 7 #include "app/gfx/canvas.h" |
8 #include "app/gfx/path.h" | 8 #include "app/gfx/path.h" |
9 #include "app/l10n_util_win.h" | 9 #include "app/l10n_util_win.h" |
10 #include "app/win_util.h" | 10 #include "app/win_util.h" |
(...skipping 895 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
906 LRESULT WidgetWin::OnWndProc(UINT message, WPARAM w_param, LPARAM l_param) { | 906 LRESULT WidgetWin::OnWndProc(UINT message, WPARAM w_param, LPARAM l_param) { |
907 HWND window = hwnd(); | 907 HWND window = hwnd(); |
908 LRESULT result = 0; | 908 LRESULT result = 0; |
909 | 909 |
910 // First allow messages sent by child controls to be processed directly by | 910 // First allow messages sent by child controls to be processed directly by |
911 // their associated views. If such a view is present, it will handle the | 911 // their associated views. If such a view is present, it will handle the |
912 // message *instead of* this WidgetWin. | 912 // message *instead of* this WidgetWin. |
913 if (ProcessNativeControlMessage(message, w_param, l_param, &result)) | 913 if (ProcessNativeControlMessage(message, w_param, l_param, &result)) |
914 return result; | 914 return result; |
915 | 915 |
916 result = base::WindowImpl::OnWndProc(message, w_param, l_param); | 916 // Otherwise we handle everything else. |
| 917 if (!ProcessWindowMessage(window, message, w_param, l_param, result)) |
| 918 result = DefWindowProc(window, message, w_param, l_param); |
| 919 if (message == WM_NCDESTROY) |
| 920 OnFinalMessage(window); |
917 if (message == WM_ACTIVATE) | 921 if (message == WM_ACTIVATE) |
918 PostProcessActivateMessage(this, LOWORD(w_param)); | 922 PostProcessActivateMessage(this, LOWORD(w_param)); |
919 return result; | 923 return result; |
920 } | 924 } |
921 | 925 |
922 // static | 926 // static |
923 void WidgetWin::PostProcessActivateMessage(WidgetWin* widget, | 927 void WidgetWin::PostProcessActivateMessage(WidgetWin* widget, |
924 int activation_state) { | 928 int activation_state) { |
925 if (!widget->focus_manager_.get()) { | 929 if (!widget->focus_manager_.get()) { |
926 NOTREACHED(); | 930 NOTREACHED(); |
(...skipping 16 matching lines...) Expand all Loading... |
943 WidgetWin* popup = new WidgetWin; | 947 WidgetWin* popup = new WidgetWin; |
944 popup->set_window_style(WS_POPUP); | 948 popup->set_window_style(WS_POPUP); |
945 popup->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW | | 949 popup->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW | |
946 WS_EX_TRANSPARENT | | 950 WS_EX_TRANSPARENT | |
947 l10n_util::GetExtendedTooltipStyles()); | 951 l10n_util::GetExtendedTooltipStyles()); |
948 popup->set_delete_on_destroy(delete_on_destroy); | 952 popup->set_delete_on_destroy(delete_on_destroy); |
949 return popup; | 953 return popup; |
950 } | 954 } |
951 | 955 |
952 } // namespace views | 956 } // namespace views |
OLD | NEW |