[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1325
Date       : Thu Jun 15 11:51:00 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/camresource.cpp
   M /Trunk/XaraLX/wxOil/dlgmgr.cpp

Fixed options dialog to have an apply button (Bug 1075)


Diff:
Index: Trunk/XaraLX/wxOil/camresource.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camresource.cpp	(revision 1324)
+++ Trunk/XaraLX/wxOil/camresource.cpp	(revision 1325)
@@ -358,6 +358,8 @@
 		FNOMAP("IDOK", "wxID_OK"); //NORESOURCEFIX
 		FNOMAP("IDCANCEL", "wxID_CANCEL"); //NORESOURCEFIX
 		FNOMAP("IDAPPLY", "wxID_APPLY"); //NORESOURCEFIX
+		FNOMAP("ID_APPLY_NOW", "wxID_APPLY"); //NORESOURCEFIX
+		FNOMAP("ID_CC_APPLY_NOW", "wxID_APPLY"); //NORESOURCEFIX
 		FNOMAP("ID_FILE_OPEN", "wxID_OPEN"); //NORESOURCEFIX
 		FNOMAP("ID_FILE_CLOSE", "wxID_CLOSE"); //NORESOURCEFIX
 		FNOMAP("ID_FILE_SAVE", "wxID_SAVE"); //NORESOURCEFIX
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1324)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1325)
@@ -346,7 +346,18 @@
 			}
 			else
 			{
-				pPropertySheet->CreateButtons( wxOK|wxCANCEL|wxHELP );
+				wxStdDialogButtonSizer *sizer = new wxStdDialogButtonSizer();
+				wxButton * ok=new wxButton(pPropertySheet, wxID_OK);
+				sizer->AddButton(ok); // Add an OK button
+				sizer->AddButton(new wxButton(pPropertySheet, wxID_CANCEL)); // Add a Cancel button
+				sizer->AddButton(new wxButton(pPropertySheet, wxID_APPLY)); // Add an Apply button
+				sizer->AddButton(new wxButton(pPropertySheet, wxID_HELP)); // Add a Help button
+				ok->SetDefault();
+				ok->SetFocus();
+				pPropertySheet->SetAffirmativeId(wxID_OK);
+				sizer->Realize();
+			    pPropertySheet->GetInnerSizer()->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxRIGHT, 2);
+    			pPropertySheet->GetInnerSizer()->AddSpacer(2);
 			}
 		}
 		pDialogWnd=pPropertySheet;


Xara