Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Upgrade WX to r74856, mainly to support @2x.
  • Loading branch information
@comex
comex committed Sep 23, 2013
1 parent 0bdef39 commit 66ed9a1
Show file tree
Hide file tree
Showing 1,935 changed files with 45,294 additions and 22,660 deletions.
31 changes: 25 additions & 6 deletions Externals/wxWidgets3/CMakeLists.txt
View file
@@ -1,11 +1,12 @@
# gtk, msw, osx and shared files as of r70933
# gtk, msw, osx and shared files as of r74856

set(SRCS_AUI
"src/aui/auibar.cpp"
"src/aui/auibook.cpp"
"src/aui/dockart.cpp"
"src/aui/floatpane.cpp"
"src/aui/framemanager.cpp"
"src/aui/tabart.cpp"
"src/aui/tabmdi.cpp")

set(SRCS_COMMON
Expand Down Expand Up @@ -151,6 +152,7 @@ set(SRCS_COMMON
#"src/common/memory.cpp"
"src/common/menucmn.cpp"
"src/common/mimecmn.cpp"
"src/common/modalhook.cpp"
"src/common/module.cpp"
"src/common/mousemanager.cpp"
"src/common/msgout.cpp"
Expand All @@ -168,6 +170,7 @@ set(SRCS_COMMON
"src/common/platinfo.cpp"
"src/common/popupcmn.cpp"
"src/common/powercmn.cpp"
"src/common/preferencescmn.cpp"
"src/common/prntbase.cpp"
"src/common/process.cpp"
"src/common/protocol.cpp"
Expand Down Expand Up @@ -216,6 +219,8 @@ set(SRCS_COMMON
"src/common/textcmn.cpp"
"src/common/textentrycmn.cpp"
"src/common/textfile.cpp"
"src/common/textmeasurecmn.cpp"
"src/common/threadinfo.cpp"
"src/common/time.cpp"
"src/common/timercmn.cpp"
"src/common/timerimpl.cpp"
Expand All @@ -236,6 +241,7 @@ set(SRCS_COMMON
"src/common/valtext.cpp"
"src/common/variant.cpp"
#"src/common/webview.cpp"
#"src/common/webviewfshandler.cpp"
"src/common/wfstream.cpp"
"src/common/wincmn.cpp"
"src/common/windowid.cpp"
Expand Down Expand Up @@ -317,6 +323,7 @@ set(SRCS_GENERIC
"src/generic/statusbr.cpp"
"src/generic/tabg.cpp"
"src/generic/textdlgg.cpp"
"src/generic/textmeasure.cpp"
"src/generic/timectrlg.cpp"
#"src/generic/timer.cpp"
"src/generic/tipdlg.cpp"
Expand All @@ -333,7 +340,8 @@ set(SRCS_GENERICGTK
"src/generic/accel.cpp"
"src/generic/icon.cpp"
"src/generic/imaglist.cpp"
"src/generic/paletteg.cpp")
"src/generic/paletteg.cpp"
"src/generic/preferencesg.cpp")

set(SRCS_GENERICOSX
"src/generic/animateg.cpp"
Expand All @@ -345,6 +353,7 @@ set(SRCS_GENERICOSX
"src/generic/fontpickerg.cpp")

set(SRCS_GTK
"src/aui/tabartgtk.cpp"
"src/gtk/aboutdlg.cpp"
"src/gtk/animate.cpp"
"src/gtk/anybutton.cpp"
Expand Down Expand Up @@ -403,6 +412,7 @@ set(SRCS_GTK
"src/gtk/nativewin.cpp"
"src/gtk/nonownedwnd.cpp"
"src/gtk/notebook.cpp"
"src/gtk/notifmsg.cpp"
"src/gtk/pen.cpp"
"src/gtk/popupwin.cpp"
#"src/gtk/print.cpp"
Expand All @@ -425,6 +435,7 @@ set(SRCS_GTK
"src/gtk/taskbar.cpp"
"src/gtk/textctrl.cpp"
"src/gtk/textentry.cpp"
"src/gtk/textmeasure.cpp"
"src/gtk/tglbtn.cpp"
"src/gtk/timer.cpp"
"src/gtk/toolbar.cpp"
Expand Down Expand Up @@ -483,6 +494,7 @@ set(SRCS_MSW
"src/msw/dragimag.cpp"
"src/msw/enhmeta.cpp"
"src/msw/evtloop.cpp"
#"src/msw/evtloopconsole.cpp"
"src/msw/fdrepdlg.cpp"
"src/msw/filedlg.cpp"
"src/msw/font.cpp"
Expand Down Expand Up @@ -533,6 +545,7 @@ set(SRCS_MSW
"src/msw/ole/dropsrc.cpp"
"src/msw/ole/droptgt.cpp"
"src/msw/ole/oleutils.cpp"
"src/msw/ole/safearray.cpp"
"src/msw/ole/uuid.cpp"
"src/msw/ownerdrw.cpp"
"src/msw/palette.cpp"
Expand All @@ -559,7 +572,7 @@ set(SRCS_MSW
"src/msw/sound.cpp"
"src/msw/spinbutt.cpp"
"src/msw/spinctrl.cpp"
#"src/msw/stackwalk.cpp"
"src/msw/stackwalk.cpp"
"src/msw/statbmp.cpp"
"src/msw/statbox.cpp"
"src/msw/statline.cpp"
Expand All @@ -569,6 +582,7 @@ set(SRCS_MSW
"src/msw/taskbar.cpp"
"src/msw/textctrl.cpp"
"src/msw/textentry.cpp"
"src/msw/textmeasure.cpp"
"src/msw/tglbtn.cpp"
"src/msw/thread.cpp"
"src/msw/timectrl.cpp"
Expand All @@ -582,6 +596,7 @@ set(SRCS_MSW
"src/msw/utils.cpp"
"src/msw/utilsexc.cpp"
"src/msw/utilsgui.cpp"
"src/msw/utilswin.cpp"
"src/msw/uxtheme.cpp"
"src/msw/version.rc"
"src/msw/volume.cpp"
Expand Down Expand Up @@ -635,7 +650,6 @@ set(SRCS_OSX
"src/osx/slider_osx.cpp"
"src/osx/sound_osx.cpp"
"src/osx/spinbutt_osx.cpp"
"src/osx/spinctrl_osx.cpp"
"src/osx/srchctrl_osx.cpp"
"src/osx/statbox_osx.cpp"
"src/osx/statline_osx.cpp"
Expand Down Expand Up @@ -816,11 +830,12 @@ set(SRCS_UNIX
#"src/unix/net.cpp"
"src/unix/snglinst.cpp"
"src/unix/sockunix.cpp"
#"src/unix/stackwalk.cpp"
"src/unix/stackwalk.cpp"
"src/unix/stdpaths.cpp"
"src/unix/threadpsx.cpp"
"src/unix/timerunx.cpp"
"src/unix/utilsunx.cpp")
"src/unix/utilsunx.cpp"
"src/unix/wakeuppipe.cpp")

set(SRCS_UNIXGTK
"src/unix/dialup.cpp"
Expand Down Expand Up @@ -890,6 +905,10 @@ endif()
add_definitions(-DWXBUILDING)
add_definitions(-Wno-deprecated-declarations)
add_definitions(-Wno-shadow)
add_definitions(-Wno-parentheses-equality)
add_definitions(-Wno-self-assign)
add_definitions(-Wno-null-conversion)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")

enable_precompiled_headers(include/wx/wxprec.h src/common/dummy.cpp SRCS)
add_library(wx STATIC ${PNG_SRCS} ${SRCS})
Expand Down
48 changes: 24 additions & 24 deletions Externals/wxWidgets3/art/addbookm.xpm
View file
@@ -1,24 +1,24 @@
/* XPM */
static const char *const addbookm_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",
"X c #00C000",
" c None",
/* pixels */
" ....... ",
" .XXXXX. ",
" .. .XXXXX. ",
" .. .XXXXX. ",
" ...... .XXXXX. ",
" ...... .XXXXX. ",
" .. .XXXXX. ",
" .. .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XX.XX. ",
" .X. .X. ",
" .. .. "
};
/* XPM */
static const char *const addbookm_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",
"X c #00C000",
" c None",
/* pixels */
" ....... ",
" .XXXXX. ",
" .. .XXXXX. ",
" .. .XXXXX. ",
" ...... .XXXXX. ",
" ...... .XXXXX. ",
" .. .XXXXX. ",
" .. .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XX.XX. ",
" .X. .X. ",
" .. .. "
};
42 changes: 21 additions & 21 deletions Externals/wxWidgets3/art/back.xpm
View file
@@ -1,21 +1,21 @@
/* XPM */
static const char *const back_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
" . ",
" .. ",
" .X. ",
" .XX........ ",
" .XXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXX. ",
" .XX........ ",
" .X. ",
" .. ",
" . ",
" "};
/* XPM */
static const char *const back_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
" . ",
" .. ",
" .X. ",
" .XX........ ",
" .XXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXX. ",
" .XX........ ",
" .X. ",
" .. ",
" . ",
" "};
114 changes: 57 additions & 57 deletions Externals/wxWidgets3/art/cdrom.xpm
View file
@@ -1,57 +1,57 @@
/* XPM */
static const char *const cdrom_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 36 1",
"= c #9BACC2",
"y c #547B99",
"$ c #FFFFFF",
"@ c #839CB5",
"o c #547897",
"4 c #4D7492",
"% c #F1F4F7",
"X c #5A809C",
"< c #8497A5",
"0 c #7898AD",
"+ c #CAD2DC",
"r c #ACAEB2",
"2 c #BECAD9",
"* c #65839D",
"e c #DCE2EA",
"- c #ADBED2",
"t c #597B9A",
" c None",
"1 c #467291",
"9 c #D6DFE7",
"O c #7393AB",
"u c #49708B",
"5 c #A0BACB",
"& c #AABFCD",
"8 c #B9CBD5",
"; c #B4C4D3",
": c #6F90A6",
"3 c #A8B6CA",
"# c #ADBACE",
"w c #E4E9ED",
". c #8EA9BC",
"> c #B3BFD1",
", c #C2CBDB",
"6 c #C0D1DC",
"7 c #A2B3C5",
"q c #5D7C93",
/* pixels */
" .XooOo+ ",
" X@#$$$%o& ",
" *=-;$$$$$o+ ",
" +O#;-$$$$$$: ",
" o=>,-<1<$2-o ",
" o3>--1$122-* ",
" o=--$<4<22-X ",
" o5$$$$$26;7* ",
" X%$$$$2;-X8 ",
" 90*9$$$-7Xqo ",
" wXwe@O44X4<r<o ",
" X8628>22222<<*4",
" ttyyyoo4441uuuo",
" t>$$$$$$$$$$$>o",
" XXXtyyyoo44411u"
};
/* XPM */
static const char *const cdrom_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 36 1",
"= c #9BACC2",
"y c #547B99",
"$ c #FFFFFF",
"@ c #839CB5",
"o c #547897",
"4 c #4D7492",
"% c #F1F4F7",
"X c #5A809C",
"< c #8497A5",
"0 c #7898AD",
"+ c #CAD2DC",
"r c #ACAEB2",
"2 c #BECAD9",
"* c #65839D",
"e c #DCE2EA",
"- c #ADBED2",
"t c #597B9A",
" c None",
"1 c #467291",
"9 c #D6DFE7",
"O c #7393AB",
"u c #49708B",
"5 c #A0BACB",
"& c #AABFCD",
"8 c #B9CBD5",
"; c #B4C4D3",
": c #6F90A6",
"3 c #A8B6CA",
"# c #ADBACE",
"w c #E4E9ED",
". c #8EA9BC",
"> c #B3BFD1",
", c #C2CBDB",
"6 c #C0D1DC",
"7 c #A2B3C5",
"q c #5D7C93",
/* pixels */
" .XooOo+ ",
" X@#$$$%o& ",
" *=-;$$$$$o+ ",
" +O#;-$$$$$$: ",
" o=>,-<1<$2-o ",
" o3>--1$122-* ",
" o=--$<4<22-X ",
" o5$$$$$26;7* ",
" X%$$$$2;-X8 ",
" 90*9$$$-7Xqo ",
" wXwe@O44X4<r<o ",
" X8628>22222<<*4",
" ttyyyoo4441uuuo",
" t>$$$$$$$$$$$>o",
" XXXtyyyoo44411u"
};

0 comments on commit 66ed9a1

Please sign in to comment.