diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-19 20:18:13 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-19 20:18:13 +0000 |
| commit | f490d83dad064de52a65a1c5a7e374a1a176f05a (patch) | |
| tree | 35d69842a56af15a5ec82dd875dfd5a2f987ad9c /xorg-server/hw/xwin | |
| parent | b567a3027bceabc0f1f42dd162268f06f15e8149 (diff) | |
| download | vcxsrv-f490d83dad064de52a65a1c5a7e374a1a176f05a.tar.gz vcxsrv-f490d83dad064de52a65a1c5a7e374a1a176f05a.tar.bz2 vcxsrv-f490d83dad064de52a65a1c5a7e374a1a176f05a.zip | |
Updated to xorg-server-1.7.0.902
Diffstat (limited to 'xorg-server/hw/xwin')
| -rw-r--r-- | xorg-server/hw/xwin/InitOutput.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/XWin.rc | 12 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winscrinit.c | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c index 2f4b0d222..9aff336e1 100644 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c @@ -706,7 +706,7 @@ OsVendorInit (void) } LogSetParameter (XLOG_FLUSH, 1); LogSetParameter (XLOG_VERBOSITY, g_iLogVerbose); - LogSetParameter (XLOG_FILE_VERBOSITY, 1); + LogSetParameter (XLOG_FILE_VERBOSITY, g_iLogVerbose); /* Log the version information */ if (serverGeneration == 1) diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc index 5a254e1ab..29c6f1ccf 100644 --- a/xorg-server/hw/xwin/XWin.rc +++ b/xorg-server/hw/xwin/XWin.rc @@ -36,7 +36,7 @@ */ /* About */ -ABOUT_BOX DIALOG DISCARDABLE 32, 32, 240, 105 +ABOUT_BOX DIALOGEX 32, 32, 240, 105 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE CAPTION "About " PROJECT_NAME FONT 8, "MS Sans Serif" @@ -58,7 +58,7 @@ END /* Depth change */ -DEPTH_CHANGE_BOX DIALOG DISCARDABLE 32, 32, 180, 100 +DEPTH_CHANGE_BOX DIALOGEX 32, 32, 180, 100 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTERMOUSE FONT 8, "MS Sans Serif" CAPTION PROJECT_NAME @@ -72,7 +72,7 @@ END /* Exit */ -EXIT_DIALOG DIALOG DISCARDABLE 32, 32, 180, 78 +EXIT_DIALOG DIALOGEX 32, 32, 180, 78 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE FONT 8, "MS Sans Serif" CAPTION "Exit " PROJECT_NAME "?" @@ -89,7 +89,7 @@ END * Menus */ -IDM_TRAYICON_MENU MENU DISCARDABLE +IDM_TRAYICON_MENU MENU BEGIN POPUP "TRAYICON_MENU" BEGIN @@ -105,5 +105,5 @@ END * Icons */ -IDI_XWIN ICON DISCARDABLE "X.ico" -IDI_XWIN_BOXED ICON DISCARDABLE "X-boxed.ico" +IDI_XWIN ICON "X.ico" +IDI_XWIN_BOXED ICON "X-boxed.ico" diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c index eab0c6ccf..99d5a464e 100644 --- a/xorg-server/hw/xwin/winscrinit.c +++ b/xorg-server/hw/xwin/winscrinit.c @@ -58,8 +58,10 @@ winMWExtWMProcs = { winMWExtWMDamageRects, #endif winMWExtWMRootlessSwitchWindow, - NULL,//winWMExtWMDoReorderWindow, - + NULL,//winMWExtWMDoReorderWindow, + NULL,//winMWExtWMHideWindow, + NULL,//winMWExtWMUpdateColorMap, + NULL,//winMWExtWMCopyBytes, NULL,//winMWExtWMFillBytes, NULL,//winMWExtWMCompositePixels, |