summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-06-13 08:00:02 +0000
committerSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-06-13 08:00:02 +0000
commit9e1842a1554a7df2f5d989a966883b8b6d8bf2ba (patch)
treef68910ee6ed2798452ca8516d5957b01fba50047 /win32
parent5cc7f3420da348afefdcf0293f14b561ea02be92 (diff)
downloadpcsxr-9e1842a1554a7df2f5d989a966883b8b6d8bf2ba.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@67807 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'win32')
-rw-r--r--win32/gui/WndMain.c4
-rwxr-xr-xwin32/gui/cdrom02.icobin9662 -> 0 bytes
-rwxr-xr-xwin32/gui/pcsxr.bmpbin185190 -> 283254 bytes
-rw-r--r--win32/gui/pcsxr.icobin0 -> 7358 bytes
-rw-r--r--win32/pcsxr.dev2
-rw-r--r--win32/pcsxr.dsp2
-rw-r--r--win32/pcsxr.rc2
-rw-r--r--win32/pcsxr.vcproj2
8 files changed, 6 insertions, 6 deletions
diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c
index f50c8b9a..77e83a90 100644
--- a/win32/gui/WndMain.c
+++ b/win32/gui/WndMain.c
@@ -1747,8 +1747,8 @@ void CreateMainWindow(int nCmdShow) {
WS_CAPTION | WS_POPUPWINDOW | WS_MINIMIZEBOX,
CW_USEDEFAULT,
0,
- 350,
- 220,
+ 356,
+ 252,
NULL,
NULL,
gApp.hInstance,
diff --git a/win32/gui/cdrom02.ico b/win32/gui/cdrom02.ico
deleted file mode 100755
index 98daa5b8..00000000
--- a/win32/gui/cdrom02.ico
+++ /dev/null
Binary files differ
diff --git a/win32/gui/pcsxr.bmp b/win32/gui/pcsxr.bmp
index fca63000..77f2e9f2 100755
--- a/win32/gui/pcsxr.bmp
+++ b/win32/gui/pcsxr.bmp
Binary files differ
diff --git a/win32/gui/pcsxr.ico b/win32/gui/pcsxr.ico
new file mode 100644
index 00000000..8dd7b262
--- /dev/null
+++ b/win32/gui/pcsxr.ico
Binary files differ
diff --git a/win32/pcsxr.dev b/win32/pcsxr.dev
index b88425d8..67d60b89 100644
--- a/win32/pcsxr.dev
+++ b/win32/pcsxr.dev
@@ -470,7 +470,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit45]
-FileName=gui\cdrom02.ico
+FileName=gui\pcsxr.ico
Folder=gui
Compile=0
CompileCpp=0
diff --git a/win32/pcsxr.dsp b/win32/pcsxr.dsp
index e8275ca3..755cf539 100644
--- a/win32/pcsxr.dsp
+++ b/win32/pcsxr.dsp
@@ -332,7 +332,7 @@ SOURCE=.\gui\AboutDlg.h
# End Source File
# Begin Source File
-SOURCE=.\gui\cdrom02.ico
+SOURCE=.\gui\pcsxr.ico
# End Source File
# Begin Source File
diff --git a/win32/pcsxr.rc b/win32/pcsxr.rc
index 7f25904d..7ccece86 100644
--- a/win32/pcsxr.rc
+++ b/win32/pcsxr.rc
@@ -371,7 +371,7 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_APP_ICON ICON DISCARDABLE "gui\\cdrom02.ico"
+IDI_APP_ICON ICON DISCARDABLE "gui\\pcsxr.ico"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/win32/pcsxr.vcproj b/win32/pcsxr.vcproj
index a37033a1..ef1c8343 100644
--- a/win32/pcsxr.vcproj
+++ b/win32/pcsxr.vcproj
@@ -920,7 +920,7 @@
>
</File>
<File
- RelativePath="gui\cdrom02.ico"
+ RelativePath="gui\pcsxr.ico"
>
</File>
<File