diff options
| author | Chun-wei Fan <fanc999@yahoo.com.tw> | 2021-06-22 06:51:56 +0000 |
|---|---|---|
| committer | Chun-wei Fan <fanc999@yahoo.com.tw> | 2021-06-22 06:51:56 +0000 |
| commit | 88730e81c155c004034bb73cd5634c88abfe8a5e (patch) | |
| tree | a77a07780ba21d3384c1a59ed933449a21e6665f | |
| parent | a9c8b879a42077859a2a8355ad08bbbd70c9ea59 (diff) | |
| parent | 0cb78a9808cd90e7b29b5a24bd591456f35b3193 (diff) | |
| download | gtk+-88730e81c155c004034bb73cd5634c88abfe8a5e.tar.gz | |
Merge branch 'fix-issue-2019' into 'gtk-3-24'
[Gtk3] GdkWin32: Remove klassTEMPSHADOW
See merge request GNOME/gtk!2749
| -rw-r--r-- | gdk/win32/gdkwindow-win32.c | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 27e5355cf7..7fe3e98af9 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -555,7 +555,6 @@ RegisterGdkClass (GdkWindowType wtype, GdkWindowTypeHint wtype_hint) static ATOM klassTOPLEVEL = 0; static ATOM klassCHILD = 0; static ATOM klassTEMP = 0; - static ATOM klassTEMPSHADOW = 0; static HICON hAppIcon = NULL; static HICON hAppIconSm = NULL; static WNDCLASSEXW wcl; @@ -652,34 +651,16 @@ RegisterGdkClass (GdkWindowType wtype, GdkWindowTypeHint wtype_hint) break; case GDK_WINDOW_TEMP: - if ((wtype_hint == GDK_WINDOW_TYPE_HINT_MENU) || - (wtype_hint == GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU) || - (wtype_hint == GDK_WINDOW_TYPE_HINT_POPUP_MENU)) + if (klassTEMP == 0) { - if (klassTEMPSHADOW == 0) - { - wcl.lpszClassName = L"gdkWindowTempShadow"; - wcl.style |= CS_SAVEBITS; - wcl.style |= 0x00020000; /* CS_DROPSHADOW */ - - ONCE_PER_CLASS (); - klassTEMPSHADOW = RegisterClassExW (&wcl); - } - - klass = klassTEMPSHADOW; + wcl.lpszClassName = L"gdkWindowTemp"; + wcl.style |= CS_SAVEBITS; + ONCE_PER_CLASS (); + klassTEMP = RegisterClassExW (&wcl); } - else - { - if (klassTEMP == 0) - { - wcl.lpszClassName = L"gdkWindowTemp"; - wcl.style |= CS_SAVEBITS; - ONCE_PER_CLASS (); - klassTEMP = RegisterClassExW (&wcl); - } - klass = klassTEMP; - } + klass = klassTEMP; + break; default: |