From 45ca51243773df34875d32e3b827c9cdb642b363 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Sun, 29 Nov 2009 22:46:45 +0000 Subject: [PATCH] wxWidgets/Win32: Re-introduce wxWidgets resources for blank mouse cursor (actually never existed in our packaged copy as originally borrowed from Dolphin). git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2274 96395faa-99c1-11dd-bbfe-3dabce05a288 --- .../wxWidgets/build/msw/wx_core_2008.vcproj | 60 ++++++++++-------- 3rdparty/wxWidgets/include/wx/msw/blank.cur | Bin 0 -> 326 bytes 3rdparty/wxWidgets/include/wx/msw/cross.cur | Bin 0 -> 326 bytes 3rdparty/wxWidgets/include/wx/msw/csquery.bmp | Bin 0 -> 206 bytes 3rdparty/wxWidgets/include/wx/msw/wx.rc | 38 +++++------ 5 files changed, 51 insertions(+), 47 deletions(-) create mode 100644 3rdparty/wxWidgets/include/wx/msw/blank.cur create mode 100644 3rdparty/wxWidgets/include/wx/msw/cross.cur create mode 100644 3rdparty/wxWidgets/include/wx/msw/csquery.bmp diff --git a/3rdparty/wxWidgets/build/msw/wx_core_2008.vcproj b/3rdparty/wxWidgets/build/msw/wx_core_2008.vcproj index dbc712a5a5..548ed6d967 100644 --- a/3rdparty/wxWidgets/build/msw/wx_core_2008.vcproj +++ b/3rdparty/wxWidgets/build/msw/wx_core_2008.vcproj @@ -1010,34 +1010,6 @@ RelativePath="..\..\src\msw\uxtheme.cpp" > - - - - - - - - - - - @@ -4747,6 +4719,38 @@ + + + + + + + + + + + + + diff --git a/3rdparty/wxWidgets/include/wx/msw/blank.cur b/3rdparty/wxWidgets/include/wx/msw/blank.cur new file mode 100644 index 0000000000000000000000000000000000000000..048f06b4aefde54e0ff825ccb5a5db4d7001d513 GIT binary patch literal 326 zcmZQzU}9ioP*7k10|Q0|1~DK@1BexX*a3(cfe;L!6oi8y|NsAw;0zE8=!O9W0CiJ? AlK=n! literal 0 HcmV?d00001 diff --git a/3rdparty/wxWidgets/include/wx/msw/cross.cur b/3rdparty/wxWidgets/include/wx/msw/cross.cur new file mode 100644 index 0000000000000000000000000000000000000000..5b8f4632f9574aa0a22ca0e6838c414918cd4822 GIT binary patch literal 326 zcmZQzU}9ioP*7lC;AaqEFkob05My9q&;Vkf5Q75{GXfzPKq&|ZLH_^$AHf+Q7SIi- W;2)4nB>up_AWy7XusT$mz&rrdPk^rg literal 0 HcmV?d00001 diff --git a/3rdparty/wxWidgets/include/wx/msw/csquery.bmp b/3rdparty/wxWidgets/include/wx/msw/csquery.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4e7bcdc30b27a8a0e6bb783100bc1487d21d5f0f GIT binary patch literal 206 zcmZ?rJ;wk6Wk5;;hp`#pkPX5hASfuvAR!^aprD|@U|?Xt z5EvN9kdTnTkeQjuP*G9A(9qDpFmd8Uh6M{2Fsxj;l3~M!4Gaek902Qm_wLlXckdV& w-n~oUL#1Kj1-uaPgUt89>Rubjfan&U3v3{I1Cs#n+a literal 0 HcmV?d00001 diff --git a/3rdparty/wxWidgets/include/wx/msw/wx.rc b/3rdparty/wxWidgets/include/wx/msw/wx.rc index da8cfe8e05..eae47fc048 100644 --- a/3rdparty/wxWidgets/include/wx/msw/wx.rc +++ b/3rdparty/wxWidgets/include/wx/msw/wx.rc @@ -45,16 +45,16 @@ END // Standard wxWindows Cursors // -WXCURSOR_HAND CURSOR DISCARDABLE "wx/msw/hand.cur" -WXCURSOR_BULLSEYE CURSOR DISCARDABLE "wx/msw/bullseye.cur" -WXCURSOR_PENCIL CURSOR DISCARDABLE "wx/msw/pencil.cur" -WXCURSOR_MAGNIFIER CURSOR DISCARDABLE "wx/msw/magnif1.cur" -WXCURSOR_ROLLER CURSOR DISCARDABLE "wx/msw/roller.cur" -WXCURSOR_PBRUSH CURSOR DISCARDABLE "wx/msw/pbrush.cur" -WXCURSOR_PLEFT CURSOR DISCARDABLE "wx/msw/pntleft.cur" -WXCURSOR_PRIGHT CURSOR DISCARDABLE "wx/msw/pntright.cur" +//WXCURSOR_HAND CURSOR DISCARDABLE "wx/msw/hand.cur" +//WXCURSOR_BULLSEYE CURSOR DISCARDABLE "wx/msw/bullseye.cur" +//WXCURSOR_PENCIL CURSOR DISCARDABLE "wx/msw/pencil.cur" +//WXCURSOR_MAGNIFIER CURSOR DISCARDABLE "wx/msw/magnif1.cur" +//WXCURSOR_ROLLER CURSOR DISCARDABLE "wx/msw/roller.cur" +//WXCURSOR_PBRUSH CURSOR DISCARDABLE "wx/msw/pbrush.cur" +//WXCURSOR_PLEFT CURSOR DISCARDABLE "wx/msw/pntleft.cur" +//WXCURSOR_PRIGHT CURSOR DISCARDABLE "wx/msw/pntright.cur" WXCURSOR_BLANK CURSOR DISCARDABLE "wx/msw/blank.cur" -WXCURSOR_RIGHT_ARROW CURSOR DISCARDABLE "wx/msw/rightarr.cur" +//WXCURSOR_RIGHT_ARROW CURSOR DISCARDABLE "wx/msw/rightarr.cur" WXCURSOR_CROSS CURSOR DISCARDABLE "wx/msw/cross.cur" @@ -65,21 +65,21 @@ WXCURSOR_CROSS CURSOR DISCARDABLE "wx/msw/cross.cur" // First wx icon in alphabetical order, so it will be used by Explorer if the // application doesn't have any icons of its own -wxICON_AAA ICON "wx/msw/std.ico" +//wxICON_AAA ICON "wx/msw/std.ico" //wxDEFAULT_FRAME ICON "wx/msw/std.ico" //wxDEFAULT_MDIPARENTFRAME ICON "wx/msw/mdi.ico" //wxDEFAULT_MDICHILDFRAME ICON "wx/msw/child.ico" // Standard small icons -wxICON_SMALL_CLOSED_FOLDER ICON "wx/msw/folder1.ico" -wxICON_SMALL_OPEN_FOLDER ICON "wx/msw/folder2.ico" -wxICON_SMALL_FILE ICON "wx/msw/file1.ico" -wxICON_SMALL_COMPUTER ICON "wx/msw/computer.ico" -wxICON_SMALL_DRIVE ICON "wx/msw/drive.ico" -wxICON_SMALL_CDROM ICON "wx/msw/cdrom.ico" -wxICON_SMALL_FLOPPY ICON "wx/msw/floppy.ico" -wxICON_SMALL_REMOVEABLE ICON "wx/msw/removble.ico" +//wxICON_SMALL_CLOSED_FOLDER ICON "wx/msw/folder1.ico" +//wxICON_SMALL_OPEN_FOLDER ICON "wx/msw/folder2.ico" +//wxICON_SMALL_FILE ICON "wx/msw/file1.ico" +//wxICON_SMALL_COMPUTER ICON "wx/msw/computer.ico" +//wxICON_SMALL_DRIVE ICON "wx/msw/drive.ico" +//wxICON_SMALL_CDROM ICON "wx/msw/cdrom.ico" +//wxICON_SMALL_FLOPPY ICON "wx/msw/floppy.ico" +//wxICON_SMALL_REMOVEABLE ICON "wx/msw/removble.ico" ////////////////////////////////////////////////////////////////////////////// // @@ -90,7 +90,7 @@ wxICON_SMALL_REMOVEABLE ICON "wx/msw/removble.ico" csquery BITMAP "wx/msw/csquery.bmp" // For obtaining the RGB values of standard colours -wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" +//wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" ////////////////////////////////////////////////////////////////////////////// //