Skip to content

Commit 7da1c0f

Browse files
AliKet徐扬斌
AliKet
authored and
徐扬斌
committed
Add native wxOverlay implementation for wxMSW
Using generic implementation doesn't work any longer since the switch to using composited windows (i.e. turning on WS_EX_COMPOSITED) by default as drawing using wxClientDC has no effect. So implement wxOverlay in a different way by using a layered window covering the original window and drawing on it instead. This is similar to Cocoa implementation of wxOverlay. Closes wxWidgets#23047.
1 parent 942cadd commit 7da1c0f

File tree

10 files changed

+321
-8
lines changed

10 files changed

+321
-8
lines changed

‎Makefile.in

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5281,7 +5281,8 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
52815281
monodll_uuid.o \
52825282
monodll_msw_evtloop.o \
52835283
monodll_access.o \
5284-
monodll_msw_bmpbndl.o
5284+
monodll_msw_bmpbndl.o \
5285+
monodll_msw_overlay.o
52855286
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
52865287
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \
52875288
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS)
@@ -6192,7 +6193,8 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \
61926193
monodll_uuid.o \
61936194
monodll_msw_evtloop.o \
61946195
monodll_access.o \
6195-
monodll_msw_bmpbndl.o
6196+
monodll_msw_bmpbndl.o \
6197+
monodll_msw_overlay.o
61966198
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
61976199
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
61986200
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS)
@@ -7292,7 +7294,8 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \
72927294
monolib_uuid.o \
72937295
monolib_msw_evtloop.o \
72947296
monolib_access.o \
7295-
monolib_msw_bmpbndl.o
7297+
monolib_msw_bmpbndl.o \
7298+
monolib_msw_overlay.o
72967299
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
72977300
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
72987301
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_17)
@@ -8203,7 +8206,8 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \
82038206
monolib_uuid.o \
82048207
monolib_msw_evtloop.o \
82058208
monolib_access.o \
8206-
monolib_msw_bmpbndl.o
8209+
monolib_msw_bmpbndl.o \
8210+
monolib_msw_overlay.o
82078211
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
82088212
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
82098213
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_17)
@@ -9457,7 +9461,8 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \
94579461
coredll_uuid.o \
94589462
coredll_msw_evtloop.o \
94599463
coredll_access.o \
9460-
coredll_msw_bmpbndl.o
9464+
coredll_msw_bmpbndl.o \
9465+
coredll_msw_overlay.o
94619466
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
94629467
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
94639468
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
@@ -10368,7 +10373,8 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \
1036810373
coredll_uuid.o \
1036910374
coredll_msw_evtloop.o \
1037010375
coredll_access.o \
10371-
coredll_msw_bmpbndl.o
10376+
coredll_msw_bmpbndl.o \
10377+
coredll_msw_overlay.o
1037210378
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
1037310379
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
1037410380
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
@@ -11195,7 +11201,8 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \
1119511201
corelib_uuid.o \
1119611202
corelib_msw_evtloop.o \
1119711203
corelib_access.o \
11198-
corelib_msw_bmpbndl.o
11204+
corelib_msw_bmpbndl.o \
11205+
corelib_msw_overlay.o
1119911206
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
1120011207
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
1120111208
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
@@ -12106,7 +12113,8 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \
1210612113
corelib_uuid.o \
1210712114
corelib_msw_evtloop.o \
1210812115
corelib_access.o \
12109-
corelib_msw_bmpbndl.o
12116+
corelib_msw_bmpbndl.o \
12117+
corelib_msw_overlay.o
1211012118
@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
1211112119
@COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
1211212120
@COND_TOOLKIT_OSX_COCOA@ $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
@@ -19139,6 +19147,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
1913919147
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_bmpbndl.o: $(srcdir)/src/msw/bmpbndl.cpp $(MONODLL_ODEP)
1914019148
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpbndl.cpp
1914119149

19150+
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_overlay.o: $(srcdir)/src/msw/overlay.cpp $(MONODLL_ODEP)
19151+
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/overlay.cpp
19152+
1914219153
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP)
1914319154
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
1914419155

@@ -24461,6 +24472,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
2446124472
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_bmpbndl.o: $(srcdir)/src/msw/bmpbndl.cpp $(MONOLIB_ODEP)
2446224473
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpbndl.cpp
2446324474

24475+
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_overlay.o: $(srcdir)/src/msw/overlay.cpp $(MONOLIB_ODEP)
24476+
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/overlay.cpp
24477+
2446424478
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP)
2446524479
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
2446624480

@@ -29888,6 +29902,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
2988829902
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_bmpbndl.o: $(srcdir)/src/msw/bmpbndl.cpp $(COREDLL_ODEP)
2988929903
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bmpbndl.cpp
2989029904

29905+
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_overlay.o: $(srcdir)/src/msw/overlay.cpp $(COREDLL_ODEP)
29906+
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/overlay.cpp
29907+
2989129908
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP)
2989229909
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
2989329910

@@ -34169,6 +34186,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
3416934186
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_bmpbndl.o: $(srcdir)/src/msw/bmpbndl.cpp $(CORELIB_ODEP)
3417034187
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bmpbndl.cpp
3417134188

34189+
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_overlay.o: $(srcdir)/src/msw/overlay.cpp $(CORELIB_ODEP)
34190+
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/overlay.cpp
34191+
3417234192
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP)
3417334193
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
3417434194

‎build/bakefiles/files.bkl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2095,6 +2095,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
20952095
src/msw/evtloop.cpp
20962096
src/msw/ole/access.cpp
20972097
src/msw/bmpbndl.cpp
2098+
src/msw/overlay.cpp
20982099
</set>
20992100
<set var="MSW_LOWLEVEL_HDR" hints="files">
21002101
wx/msw/nonownedwnd.h

‎build/cmake/files.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1969,6 +1969,7 @@ set(MSW_LOWLEVEL_SRC
19691969
src/msw/evtloop.cpp
19701970
src/msw/ole/access.cpp
19711971
src/msw/bmpbndl.cpp
1972+
src/msw/overlay.cpp
19721973
)
19731974

19741975
set(MSW_LOWLEVEL_HDR

‎build/files

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1951,6 +1951,7 @@ MSW_LOWLEVEL_SRC =
19511951
src/msw/ole/oleutils.cpp
19521952
src/msw/ole/safearray.cpp
19531953
src/msw/ole/uuid.cpp
1954+
src/msw/overlay.cpp
19541955
src/msw/palette.cpp
19551956
src/msw/pen.cpp
19561957
src/msw/popupwin.cpp

‎build/msw/makefile.gcc

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,6 +1940,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
19401940
$(OBJS)\monodll_evtloop.o \
19411941
$(OBJS)\monodll_access.o \
19421942
$(OBJS)\monodll_msw_bmpbndl.o \
1943+
$(OBJS)\monodll_overlay.o \
19431944
$(OBJS)\monodll_clrpickerg.o \
19441945
$(OBJS)\monodll_collpaneg.o \
19451946
$(OBJS)\monodll_filepickerg.o \
@@ -2288,6 +2289,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
22882289
$(OBJS)\monodll_evtloop.o \
22892290
$(OBJS)\monodll_access.o \
22902291
$(OBJS)\monodll_msw_bmpbndl.o \
2292+
$(OBJS)\monodll_overlay.o \
22912293
$(OBJS)\monodll_generic_accel.o \
22922294
$(OBJS)\monodll_clrpickerg.o \
22932295
$(OBJS)\monodll_collpaneg.o \
@@ -2790,6 +2792,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
27902792
$(OBJS)\monolib_evtloop.o \
27912793
$(OBJS)\monolib_access.o \
27922794
$(OBJS)\monolib_msw_bmpbndl.o \
2795+
$(OBJS)\monolib_overlay.o \
27932796
$(OBJS)\monolib_clrpickerg.o \
27942797
$(OBJS)\monolib_collpaneg.o \
27952798
$(OBJS)\monolib_filepickerg.o \
@@ -3138,6 +3141,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
31383141
$(OBJS)\monolib_evtloop.o \
31393142
$(OBJS)\monolib_access.o \
31403143
$(OBJS)\monolib_msw_bmpbndl.o \
3144+
$(OBJS)\monolib_overlay.o \
31413145
$(OBJS)\monolib_generic_accel.o \
31423146
$(OBJS)\monolib_clrpickerg.o \
31433147
$(OBJS)\monolib_collpaneg.o \
@@ -3522,6 +3526,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
35223526
$(OBJS)\coredll_evtloop.o \
35233527
$(OBJS)\coredll_access.o \
35243528
$(OBJS)\coredll_msw_bmpbndl.o \
3529+
$(OBJS)\coredll_overlay.o \
35253530
$(OBJS)\coredll_clrpickerg.o \
35263531
$(OBJS)\coredll_collpaneg.o \
35273532
$(OBJS)\coredll_filepickerg.o \
@@ -3870,6 +3875,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
38703875
$(OBJS)\coredll_evtloop.o \
38713876
$(OBJS)\coredll_access.o \
38723877
$(OBJS)\coredll_msw_bmpbndl.o \
3878+
$(OBJS)\coredll_overlay.o \
38733879
$(OBJS)\coredll_generic_accel.o \
38743880
$(OBJS)\coredll_clrpickerg.o \
38753881
$(OBJS)\coredll_collpaneg.o \
@@ -4211,6 +4217,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
42114217
$(OBJS)\corelib_evtloop.o \
42124218
$(OBJS)\corelib_access.o \
42134219
$(OBJS)\corelib_msw_bmpbndl.o \
4220+
$(OBJS)\corelib_overlay.o \
42144221
$(OBJS)\corelib_clrpickerg.o \
42154222
$(OBJS)\corelib_collpaneg.o \
42164223
$(OBJS)\corelib_filepickerg.o \
@@ -4559,6 +4566,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
45594566
$(OBJS)\corelib_evtloop.o \
45604567
$(OBJS)\corelib_access.o \
45614568
$(OBJS)\corelib_msw_bmpbndl.o \
4569+
$(OBJS)\corelib_overlay.o \
45624570
$(OBJS)\corelib_generic_accel.o \
45634571
$(OBJS)\corelib_clrpickerg.o \
45644572
$(OBJS)\corelib_collpaneg.o \
@@ -8456,6 +8464,11 @@ $(OBJS)\monodll_msw_bmpbndl.o: ../../src/msw/bmpbndl.cpp
84568464
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
84578465
endif
84588466

8467+
ifeq ($(USE_GUI),1)
8468+
$(OBJS)\monodll_overlay.o: ../../src/msw/overlay.cpp
8469+
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
8470+
endif
8471+
84598472
ifeq ($(USE_GUI),1)
84608473
$(OBJS)\monodll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
84618474
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11051,6 +11064,11 @@ $(OBJS)\monolib_msw_bmpbndl.o: ../../src/msw/bmpbndl.cpp
1105111064
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
1105211065
endif
1105311066

11067+
ifeq ($(USE_GUI),1)
11068+
$(OBJS)\monolib_overlay.o: ../../src/msw/overlay.cpp
11069+
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
11070+
endif
11071+
1105411072
ifeq ($(USE_GUI),1)
1105511073
$(OBJS)\monolib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
1105611074
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -13613,6 +13631,11 @@ $(OBJS)\coredll_msw_bmpbndl.o: ../../src/msw/bmpbndl.cpp
1361313631
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
1361413632
endif
1361513633

13634+
ifeq ($(USE_GUI),1)
13635+
$(OBJS)\coredll_overlay.o: ../../src/msw/overlay.cpp
13636+
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
13637+
endif
13638+
1361613639
ifeq ($(USE_GUI),1)
1361713640
$(OBJS)\coredll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
1361813641
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -15368,6 +15391,11 @@ $(OBJS)\corelib_msw_bmpbndl.o: ../../src/msw/bmpbndl.cpp
1536815391
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
1536915392
endif
1537015393

15394+
ifeq ($(USE_GUI),1)
15395+
$(OBJS)\corelib_overlay.o: ../../src/msw/overlay.cpp
15396+
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
15397+
endif
15398+
1537115399
ifeq ($(USE_GUI),1)
1537215400
$(OBJS)\corelib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
1537315401
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

‎build/msw/makefile.vc

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2267,6 +2267,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
22672267
$(OBJS)\monodll_evtloop.obj \
22682268
$(OBJS)\monodll_access.obj \
22692269
$(OBJS)\monodll_msw_bmpbndl.obj \
2270+
$(OBJS)\monodll_overlay.obj \
22702271
$(OBJS)\monodll_clrpickerg.obj \
22712272
$(OBJS)\monodll_collpaneg.obj \
22722273
$(OBJS)\monodll_filepickerg.obj \
@@ -2613,6 +2614,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
26132614
$(OBJS)\monodll_evtloop.obj \
26142615
$(OBJS)\monodll_access.obj \
26152616
$(OBJS)\monodll_msw_bmpbndl.obj \
2617+
$(OBJS)\monodll_overlay.obj \
26162618
$(OBJS)\monodll_generic_accel.obj \
26172619
$(OBJS)\monodll_clrpickerg.obj \
26182620
$(OBJS)\monodll_collpaneg.obj \
@@ -3117,6 +3119,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
31173119
$(OBJS)\monolib_evtloop.obj \
31183120
$(OBJS)\monolib_access.obj \
31193121
$(OBJS)\monolib_msw_bmpbndl.obj \
3122+
$(OBJS)\monolib_overlay.obj \
31203123
$(OBJS)\monolib_clrpickerg.obj \
31213124
$(OBJS)\monolib_collpaneg.obj \
31223125
$(OBJS)\monolib_filepickerg.obj \
@@ -3463,6 +3466,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
34633466
$(OBJS)\monolib_evtloop.obj \
34643467
$(OBJS)\monolib_access.obj \
34653468
$(OBJS)\monolib_msw_bmpbndl.obj \
3469+
$(OBJS)\monolib_overlay.obj \
34663470
$(OBJS)\monolib_generic_accel.obj \
34673471
$(OBJS)\monolib_clrpickerg.obj \
34683472
$(OBJS)\monolib_collpaneg.obj \
@@ -3899,6 +3903,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
38993903
$(OBJS)\coredll_evtloop.obj \
39003904
$(OBJS)\coredll_access.obj \
39013905
$(OBJS)\coredll_msw_bmpbndl.obj \
3906+
$(OBJS)\coredll_overlay.obj \
39023907
$(OBJS)\coredll_clrpickerg.obj \
39033908
$(OBJS)\coredll_collpaneg.obj \
39043909
$(OBJS)\coredll_filepickerg.obj \
@@ -4245,6 +4250,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
42454250
$(OBJS)\coredll_evtloop.obj \
42464251
$(OBJS)\coredll_access.obj \
42474252
$(OBJS)\coredll_msw_bmpbndl.obj \
4253+
$(OBJS)\coredll_overlay.obj \
42484254
$(OBJS)\coredll_generic_accel.obj \
42494255
$(OBJS)\coredll_clrpickerg.obj \
42504256
$(OBJS)\coredll_collpaneg.obj \
@@ -4586,6 +4592,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
45864592
$(OBJS)\corelib_evtloop.obj \
45874593
$(OBJS)\corelib_access.obj \
45884594
$(OBJS)\corelib_msw_bmpbndl.obj \
4595+
$(OBJS)\corelib_overlay.obj \
45894596
$(OBJS)\corelib_clrpickerg.obj \
45904597
$(OBJS)\corelib_collpaneg.obj \
45914598
$(OBJS)\corelib_filepickerg.obj \
@@ -4932,6 +4939,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
49324939
$(OBJS)\corelib_evtloop.obj \
49334940
$(OBJS)\corelib_access.obj \
49344941
$(OBJS)\corelib_msw_bmpbndl.obj \
4942+
$(OBJS)\corelib_overlay.obj \
49354943
$(OBJS)\corelib_generic_accel.obj \
49364944
$(OBJS)\corelib_clrpickerg.obj \
49374945
$(OBJS)\corelib_collpaneg.obj \
@@ -8911,6 +8919,11 @@ $(OBJS)\monodll_msw_bmpbndl.obj: ..\..\src\msw\bmpbndl.cpp
89118919
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpbndl.cpp
89128920
!endif
89138921

8922+
!if "$(USE_GUI)" == "1"
8923+
$(OBJS)\monodll_overlay.obj: ..\..\src\msw\overlay.cpp
8924+
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\overlay.cpp
8925+
!endif
8926+
89148927
!if "$(USE_GUI)" == "1"
89158928
$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
89168929
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
@@ -11506,6 +11519,11 @@ $(OBJS)\monolib_msw_bmpbndl.obj: ..\..\src\msw\bmpbndl.cpp
1150611519
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpbndl.cpp
1150711520
!endif
1150811521

11522+
!if "$(USE_GUI)" == "1"
11523+
$(OBJS)\monolib_overlay.obj: ..\..\src\msw\overlay.cpp
11524+
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\overlay.cpp
11525+
!endif
11526+
1150911527
!if "$(USE_GUI)" == "1"
1151011528
$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
1151111529
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
@@ -14068,6 +14086,11 @@ $(OBJS)\coredll_msw_bmpbndl.obj: ..\..\src\msw\bmpbndl.cpp
1406814086
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bmpbndl.cpp
1406914087
!endif
1407014088

14089+
!if "$(USE_GUI)" == "1"
14090+
$(OBJS)\coredll_overlay.obj: ..\..\src\msw\overlay.cpp
14091+
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\overlay.cpp
14092+
!endif
14093+
1407114094
!if "$(USE_GUI)" == "1"
1407214095
$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
1407314096
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
@@ -15823,6 +15846,11 @@ $(OBJS)\corelib_msw_bmpbndl.obj: ..\..\src\msw\bmpbndl.cpp
1582315846
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bmpbndl.cpp
1582415847
!endif
1582515848

15849+
!if "$(USE_GUI)" == "1"
15850+
$(OBJS)\corelib_overlay.obj: ..\..\src\msw\overlay.cpp
15851+
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\overlay.cpp
15852+
!endif
15853+
1582615854
!if "$(USE_GUI)" == "1"
1582715855
$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
1582815856
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp

‎build/msw/wx_core.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,6 +1079,7 @@
10791079
<ClCompile Include="..\..\src\common\bmpcboxcmn.cpp" />
10801080
<ClCompile Include="..\..\src\generic\rowheightcache.cpp" />
10811081
<ClCompile Include="..\..\src\generic\creddlgg.cpp" />
1082+
<ClCompile Include="..\..\src\msw\overlay.cpp" />
10821083
</ItemGroup>
10831084
<ItemGroup>
10841085
<ResourceCompile Include="..\..\src\msw\version.rc">

‎build/msw/wx_core.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -942,6 +942,9 @@
942942
<ClCompile Include="..\..\src\msw\ole\uuid.cpp">
943943
<Filter>MSW Sources</Filter>
944944
</ClCompile>
945+
<ClCompile Include="..\..\src\msw\overlay.cpp">
946+
<Filter>MSW Sources</Filter>
947+
</ClCompile>
945948
<ClCompile Include="..\..\src\msw\ownerdrw.cpp">
946949
<Filter>MSW Sources</Filter>
947950
</ClCompile>

‎include/wx/private/overlay.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
#define wxHAS_NATIVE_OVERLAY 1
1818
#elif defined(__WXOSX__) && wxOSX_USE_COCOA
1919
#define wxHAS_NATIVE_OVERLAY 1
20+
#elif defined(__WXMSW__)
21+
#define wxHAS_NATIVE_OVERLAY 1
2022
#elif defined(__WXGTK3__)
2123
#define wxHAS_NATIVE_OVERLAY 1
2224
#define wxHAS_GENERIC_OVERLAY 1

0 commit comments

Comments
 (0)