[ShareDaemon-CVS] ui-wx/src MainDlg.cpp,1.45,1.46

[<ma...@us...>]

Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26263

Modified Files:
	MainDlg.cpp 
Log Message:
Fixed fullscreenmode for wxMSW, added Fullscreen option to menubar and fixed popupmenu positioning while in fullscreen.

Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- MainDlg.cpp	29 Dec 2003 06:22:42 -0000	1.45
+++ MainDlg.cpp	29 Dec 2003 07:00:18 -0000	1.46
@@ -573,6 +573,7 @@
 #endif
 
 	view_menu->Append(ID_VIEW_TBAR, _("ToolBar Alignment"), view_tbar_menu);
+	view_menu->Append(ID_FULLSCREEN, _("Fullscreen"));
 
 	/* HELP MENU */
 	wxMenu *help_menu = new wxMenu();
@@ -854,7 +855,11 @@
 	menu->Append(ID_ABOUT, _("About..."));
 	menu->Append(ID_QUIT, _("Exit"));
 
-	PopupMenu(menu, ScreenToClient(wxGetMousePosition()));
+	if (IsFullScreen()) {
+		PopupMenu(menu, wxGetMousePosition());
+	} else {
+		PopupMenu(menu, ScreenToClient(wxGetMousePosition()));
+	}
 	delete menu;
 }
 
@@ -928,7 +933,10 @@
 			event.Skip();
 			break;
 		case ID_FULLSCREEN:
-			ShowFullScreen(!IsFullScreen());
+			ShowFullScreen(
+				!IsFullScreen(), 
+				wxFULLSCREEN_NOBORDER|wxFULLSCREEN_NOCAPTION
+			);
 			break;
 		case ID_ABOUT:
 			break;