X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwengineo.c;h=d10f3d9ab0dd02c127d75e9bcea4c52f8232ad71;hb=09d3d08d9ce11ff482e34bad7b97380f134c14f4;hp=a2d77ed6b2baa16fa7b121b45c023fc48eb840c3;hpb=91d8e5853ca580769cc130aa6ea004869118d171;p=xboard.git

diff --git a/winboard/wengineo.c b/winboard/wengineo.c
index a2d77ed..d10f3d9 100644
--- a/winboard/wengineo.c
+++ b/winboard/wengineo.c
@@ -78,6 +78,8 @@ extern HWND hwndMain;
 
 extern WindowPlacement wpEngineOutput;
 
+extern BoardSize boardSize;
+
 /* Module variables */
 #define H_MARGIN            2
 #define V_MARGIN            2
@@ -119,9 +121,9 @@ typedef struct {
     int an_move_count;
 } EngineOutputData;
 
-static VerifyDisplayMode();
+static void VerifyDisplayMode();
 static void UpdateControls( EngineOutputData * ed );
-static SetEngineState( int which, int state, char * state_data );
+static void SetEngineState( int which, int state, char * state_data );
 
 // front end
 static HICON LoadIconEx( int id )
@@ -248,9 +250,9 @@ static void ResizeWindowControls( HWND hDlg, int mode )
 {
     RECT rc;
     int headerHeight = GetHeaderHeight();
-    int labelHeight = GetControlHeight( hDlg, IDC_EngineLabel1 );
-    int labelOffset = H_MARGIN + ICON_SIZE + H_MARGIN;
-    int labelDeltaY = ICON_SIZE - labelHeight;
+//    int labelHeight = GetControlHeight( hDlg, IDC_EngineLabel1 );
+//    int labelOffset = H_MARGIN + ICON_SIZE + H_MARGIN;
+//    int labelDeltaY = ICON_SIZE - labelHeight;
     int clientWidth;
     int clientHeight;
     int maxControlWidth;
@@ -339,6 +341,10 @@ LRESULT CALLBACK EngineOutputProc( HWND hDlg, UINT message, WPARAM wParam, LPARA
 
             ResizeWindowControls( hDlg, windowMode );
 
+	    /* Set font */
+	    SendDlgItemMessage( engineOutputDialog, IDC_EngineMemo1, WM_SETFONT, (WPARAM)font[boardSize][MOVEHISTORY_FONT]->hf, MAKELPARAM(TRUE, 0 ));
+	    SendDlgItemMessage( engineOutputDialog, IDC_EngineMemo2, WM_SETFONT, (WPARAM)font[boardSize][MOVEHISTORY_FONT]->hf, MAKELPARAM(TRUE, 0 ));
+
             SetEngineState( 0, STATE_IDLE, "" );
             SetEngineState( 1, STATE_IDLE, "" );
         }
@@ -448,7 +454,7 @@ void DoClearMemo(int which)
 
 
 // back end, due to front-end wrapper for SetWindowText, and new SetIcon arguments
-static SetEngineState( int which, int state, char * state_data )
+static void SetEngineState( int which, int state, char * state_data )
 {
     int x_which = 1 - which;
 
@@ -581,6 +587,7 @@ char GetEngineColor( int which )
             result = cps->twoMachinesColor[0];
             result = result == 'w' ? ENGINE_COLOR_WHITE : ENGINE_COLOR_BLACK;
             break;
+        default: ; // does not happen, but suppresses pedantic warnings
         }
     }
 
@@ -618,6 +625,7 @@ static int IsEnginePondering( int which )
             if( GetEngineColor( which ) != GetActiveEngineColor() ) result = TRUE;
         }
         break;
+    default: ; // does not happen, but suppresses pedantic warnings
     }
 
     return result;
@@ -634,7 +642,7 @@ static void SetDisplayMode( int mode )
 }
 
 // pure back end
-static VerifyDisplayMode()
+static void VerifyDisplayMode()
 {
     int mode;
 
@@ -684,7 +692,7 @@ static void SetEngineColorIcon( int which )
 // pure back end, now SetWindowText is called via wrapper DoSetWindowText
 static void UpdateControls( EngineOutputData * ed )
 {
-    int isPondering = FALSE;
+//    int isPondering = FALSE;
 
     char s_label[MAX_NAME_LENGTH + 32];
     
@@ -727,7 +735,7 @@ static void UpdateControls( EngineOutputData * ed )
         SetEngineState( ed->which, STATE_THINKING, "" );
     }
     else if( gameMode == AnalyzeMode || gameMode == AnalyzeFile
-	  || gameMode == IcsObserving && appData.icsEngineAnalyze) { // [HGM] ICS-analyze
+	  || (gameMode == IcsObserving && appData.icsEngineAnalyze)) { // [HGM] ICS-analyze
         char buf[64];
         int time_secs = ed->time / 100;
         int time_mins = time_secs / 60;