diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-19 20:43:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-19 20:43:37 +0000 |
| commit | 9dbe22229a8031aa2f6d922896e1b6539441b7b5 (patch) | |
| tree | bd567f1d98f9431b4963dc3d0b05aea8ac78a1b6 /xorg-server/hw/xwin | |
| parent | 07d4e6e86e3167bed18d2af81a56f3d9352d2541 (diff) | |
| parent | 7687adcc34c9fc43d526f30b1cf2039b0af48841 (diff) | |
| download | vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.tar.gz vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.tar.bz2 vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xwin')
| -rw-r--r-- | xorg-server/hw/xwin/XWin.rc | 12 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/winscrinit.c | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc index 913e55e9d..8966fd122 100644 --- a/xorg-server/hw/xwin/XWin.rc +++ b/xorg-server/hw/xwin/XWin.rc @@ -38,7 +38,7 @@ */
/* About */
-ABOUT_BOX DIALOGEX DISCARDABLE 32, 32, 260, 95
+ABOUT_BOX DIALOGEX 32, 32, 260, 95
STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE
CAPTION "About VcXsrv"
FONT 8, "MS Shell Dlg 2"
@@ -52,7 +52,7 @@ END /* Depth change */
-DEPTH_CHANGE_BOX DIALOGEX 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 Shell Dlg 2"
CAPTION "VcXsrv"
@@ -66,7 +66,7 @@ END /* Exit */
-EXIT_DIALOG DIALOGEX 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 Shell Dlg 2"
CAPTION "Exit VcXsrv?"
@@ -83,7 +83,7 @@ END * Menus
*/
-IDM_TRAYICON_MENU MENU DISCARDABLE
+IDM_TRAYICON_MENU MENU
BEGIN
POPUP "TRAYICON_MENU"
BEGIN
@@ -99,5 +99,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 9616272c7..b97b6a0de 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, |