Index: search/org/eclipse/search/internal/ui/SearchDialog.java
===================================================================
RCS file: /home/eclipse/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchDialog.java,v
retrieving revision 1.31
diff -u -r1.31 SearchDialog.java
--- search/org/eclipse/search/internal/ui/SearchDialog.java	10 Mar 2003 21:54:54 -0000	1.31
+++ search/org/eclipse/search/internal/ui/SearchDialog.java	17 Mar 2003 21:45:34 -0000
@@ -333,6 +333,7 @@
 		
 		Control result= super.createButtonBar(composite);
 		getButton(IDialogConstants.FINISH_ID).setEnabled(fDescriptors.size() > 0);
+		applyDialogFont(result);
 		return result;
 	}
 
@@ -522,7 +523,8 @@
 				c.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 				c.setLayout(layout);
 				fScopeParts[index]= new ScopePart(this);
-				fScopeParts[index].createPart(c);
+				Control part= fScopeParts[index].createPart(c);
+				applyDialogFont(part);
 				fScopeParts[index].setVisible(true);
 			}
 		}
Index: search/org/eclipse/search/internal/ui/text/ReplaceDialog.java
===================================================================
RCS file: /home/eclipse/org.eclipse.search/search/org/eclipse/search/internal/ui/text/ReplaceDialog.java,v
retrieving revision 1.8
diff -u -r1.8 ReplaceDialog.java
--- search/org/eclipse/search/internal/ui/text/ReplaceDialog.java	10 Mar 2003 21:54:54 -0000	1.8
+++ search/org/eclipse/search/internal/ui/text/ReplaceDialog.java	17 Mar 2003 21:45:37 -0000
@@ -186,6 +186,7 @@
 		gd.horizontalSpan= 2;
 		fSaveButton.setLayoutData(gd);
 		
+		applyDialogFont(result);
 		return result;
 	}
 
Index: search/org/eclipse/search/internal/ui/text/TextSearchPage.java
===================================================================
RCS file: /home/eclipse/org.eclipse.search/search/org/eclipse/search/internal/ui/text/TextSearchPage.java,v
retrieving revision 1.42
diff -u -r1.42 TextSearchPage.java
--- search/org/eclipse/search/internal/ui/text/TextSearchPage.java	10 Mar 2003 21:54:54 -0000	1.42
+++ search/org/eclipse/search/internal/ui/text/TextSearchPage.java	17 Mar 2003 21:45:40 -0000
@@ -41,6 +41,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.DialogPage;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
@@ -296,7 +297,7 @@
 		layouter.perform(createFileNamePatternComposite(result));
 
 		setControl(result);
-		
+		Dialog.applyDialogFont(result);
 		WorkbenchHelp.setHelp(result, ISearchHelpContextIds.TEXT_SEARCH_PAGE);
 	}
 
Index: search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java
===================================================================
RCS file: /home/eclipse/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java,v
retrieving revision 1.10
diff -u -r1.10 ExtendedDialogWindow.java
--- search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java	10 Mar 2003 21:54:54 -0000	1.10
+++ search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java	17 Mar 2003 21:45:42 -0000
@@ -130,6 +130,7 @@
 		Label separator= new Label(result, SWT.SEPARATOR | SWT.HORIZONTAL);
 		separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		
+		applyDialogFont(result);
 		return result;
 	}
 	
Index: search/org/eclipse/search/internal/ui/util/ListDialog.java
===================================================================
RCS file: /home/eclipse/org.eclipse.search/search/org/eclipse/search/internal/ui/util/ListDialog.java,v
retrieving revision 1.6
diff -u -r1.6 ListDialog.java
--- search/org/eclipse/search/internal/ui/util/ListDialog.java	10 Mar 2003 21:54:54 -0000	1.6
+++ search/org/eclipse/search/internal/ui/util/ListDialog.java	17 Mar 2003 21:45:43 -0000
@@ -67,6 +67,7 @@
 		GridData gd= new GridData(GridData.FILL_BOTH);
 		gd.widthHint= convertWidthInCharsToPixels(WIDTH_IN_CHARACTERS);
 		label.setLayoutData(gd);
+		applyDialogFont(label);
 		return label;
 	}
 	
@@ -95,6 +96,7 @@
 		gd.heightHint= convertHeightInCharsToPixels(15);
 		gd.widthHint= convertWidthInCharsToPixels(WIDTH_IN_CHARACTERS);
 		table.setLayoutData(gd);
+		applyDialogFont(table);
 		return table;
 	}
 	
Index: search/org/eclipse/search/internal/ui/util/SWTUtil.java
===================================================================
RCS file: /home/eclipse/org.eclipse.search/search/org/eclipse/search/internal/ui/util/SWTUtil.java,v
retrieving revision 1.4
diff -u -r1.4 SWTUtil.java
--- search/org/eclipse/search/internal/ui/util/SWTUtil.java	10 Mar 2003 21:54:54 -0000	1.4
+++ search/org/eclipse/search/internal/ui/util/SWTUtil.java	17 Mar 2003 21:45:44 -0000
@@ -27,6 +27,7 @@
 import org.eclipse.swt.widgets.Widget;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.util.Assert;
 
 /**
@@ -111,6 +112,8 @@
 	 * Returns a width hint for a button control.
 	 */
 	public static int getButtonWidthHint(Button button) {
+		if (button.getFont().equals(JFaceResources.getDefaultFont()))
+			button.setFont(JFaceResources.getDialogFont());
 		if (fgHorizontalDialogUnitSize == 0.0) {
 			initializeDialogUnits(button);
 		}
@@ -122,6 +125,8 @@
 	 * Returns a height hint for a button control.
 	 */		
 	public static int getButtonHeigthHint(Button button) {
+		if (button.getFont().equals(JFaceResources.getDefaultFont()))
+			button.setFont(JFaceResources.getDialogFont());
 		if (fgHorizontalDialogUnitSize == 0.0) {
 			initializeDialogUnits(button);
 		}
Index: search/org/eclipse/search/internal/ui/util/TypeFilteringDialog.java
===================================================================
RCS file: /home/eclipse/org.eclipse.search/search/org/eclipse/search/internal/ui/util/TypeFilteringDialog.java,v
retrieving revision 1.11
diff -u -r1.11 TypeFilteringDialog.java
--- search/org/eclipse/search/internal/ui/util/TypeFilteringDialog.java	10 Mar 2003 21:54:54 -0000	1.11
+++ search/org/eclipse/search/internal/ui/util/TypeFilteringDialog.java	17 Mar 2003 21:45:46 -0000
@@ -205,6 +205,7 @@
 		if (fInitialSelections != null && !fInitialSelections.isEmpty())
 			checkInitialSelections();
 
+		applyDialogFont(composite);
 		return composite;
 	}