andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/xwin: Remove obsolete control handling for About dialog

Browse Source 
Remove the unused, cygwin-specific handling for ChangeLog, UG and CG buttons in
the About... Dialog.  The buttons themselves were removed in commmit
34269a90ea.

Also remove those window control IDs which are now obsolete.

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2013-03-31 18:29:07 +01:00
parent 3b4d472b72
commit ab61d07002
2 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
hw/xwin/windialogs.c
View File

@ -574,10 +574,7 @@ winAboutDlgProc(HWND hwndDialog, UINT message, WPARAM wParam, LPARAM lParam)
winInitDialog(hwndDialog); winInitDialog(hwndDialog);
/* Override the URL buttons */ /* Override the URL buttons */
winOverrideURLButton(hwndDialog, ID_ABOUT_CHANGELOG);
winOverrideURLButton(hwndDialog, ID_ABOUT_WEBSITE); winOverrideURLButton(hwndDialog, ID_ABOUT_WEBSITE);
winOverrideURLButton(hwndDialog, ID_ABOUT_UG);
winOverrideURLButton(hwndDialog, ID_ABOUT_FAQ);
return TRUE; return TRUE;
@ -608,30 +605,10 @@ winAboutDlgProc(HWND hwndDialog, UINT message, WPARAM wParam, LPARAM lParam)
PostMessage(s_pScreenPriv->hwndScreen, WM_NULL, 0, 0); PostMessage(s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
/* Restore window procedures for URL buttons */ /* Restore window procedures for URL buttons */
winUnoverrideURLButton(hwndDialog, ID_ABOUT_CHANGELOG);
winUnoverrideURLButton(hwndDialog, ID_ABOUT_WEBSITE); winUnoverrideURLButton(hwndDialog, ID_ABOUT_WEBSITE);
winUnoverrideURLButton(hwndDialog, ID_ABOUT_UG);
winUnoverrideURLButton(hwndDialog, ID_ABOUT_FAQ);
return TRUE; return TRUE;
case ID_ABOUT_CHANGELOG:
{
INT_PTR iReturn;
const char *pszWinPath = "http://x.cygwin.com/"
"devel/server/changelog.html";
iReturn = (INT_PTR) ShellExecute(NULL,
"open",
pszWinPath, NULL, NULL, SW_MAXIMIZE);
if (iReturn < 32) {
ErrorF("winAboutDlgProc - WM_COMMAND - ID_ABOUT_CHANGELOG - "
"ShellExecute failed: %d\n", (int)iReturn);
}
}
return TRUE;
case ID_ABOUT_WEBSITE: case ID_ABOUT_WEBSITE:
{ {
const char *pszPath = __VENDORDWEBSUPPORT__; const char *pszPath = __VENDORDWEBSUPPORT__;
@ -647,36 +624,6 @@ winAboutDlgProc(HWND hwndDialog, UINT message, WPARAM wParam, LPARAM lParam)
} }
} }
return TRUE; return TRUE;
case ID_ABOUT_UG:
{
const char *pszPath = "http://x.cygwin.com/docs/ug/";
INT_PTR iReturn;
iReturn = (INT_PTR) ShellExecute(NULL,
"open",
pszPath, NULL, NULL, SW_MAXIMIZE);
if (iReturn < 32) {
ErrorF("winAboutDlgProc - WM_COMMAND - ID_ABOUT_UG - "
"ShellExecute failed: %d\n", (int)iReturn);
}
}
return TRUE;
case ID_ABOUT_FAQ:
{
const char *pszPath = "http://x.cygwin.com/docs/faq/";
INT_PTR iReturn;
iReturn = (INT_PTR) ShellExecute(NULL,
"open",
pszPath, NULL, NULL, SW_MAXIMIZE);
if (iReturn < 32) {
ErrorF("winAboutDlgProc - WM_COMMAND - ID_ABOUT_FAQ - "
"ShellExecute failed: %d\n", (int)iReturn);
}
}
return TRUE;
} }
break; break;
@ -690,10 +637,7 @@ winAboutDlgProc(HWND hwndDialog, UINT message, WPARAM wParam, LPARAM lParam)
PostMessage(s_pScreenPriv->hwndScreen, WM_NULL, 0, 0); PostMessage(s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
/* Restore window procedures for URL buttons */ /* Restore window procedures for URL buttons */
winUnoverrideURLButton(hwndDialog, ID_ABOUT_CHANGELOG);
winUnoverrideURLButton(hwndDialog, ID_ABOUT_WEBSITE); winUnoverrideURLButton(hwndDialog, ID_ABOUT_WEBSITE);
winUnoverrideURLButton(hwndDialog, ID_ABOUT_UG);
winUnoverrideURLButton(hwndDialog, ID_ABOUT_FAQ);
return TRUE; return TRUE;
} }

3
hw/xwin/winresource.h
View File

@ -44,9 +44,6 @@
#define ID_APP_ALWAYS_ON_TOP 202 #define ID_APP_ALWAYS_ON_TOP 202
#define ID_APP_ABOUT 203 #define ID_APP_ABOUT 203
#define ID_ABOUT_UG 300
#define ID_ABOUT_FAQ 301
#define ID_ABOUT_CHANGELOG 302
#define ID_ABOUT_WEBSITE 303 #define ID_ABOUT_WEBSITE 303
#endif #endif