Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 451406 | Differences between
and this patch

Collapse All | Expand All

(-)ros/src/Draw/Draw_Window.cxx.ori (-4 / +4 lines)
Lines 84-90 Link Here
84
      errChannel = Tcl_GetStdChannel(TCL_STDERR);
84
      errChannel = Tcl_GetStdChannel(TCL_STDERR);
85
      if (code != TCL_OK) {
85
      if (code != TCL_OK) {
86
        if (errChannel) {
86
        if (errChannel) {
87
          Tcl_Write(errChannel, Interp->result, -1);
87
          Tcl_Write(errChannel, Tcl_GetStringResult(Interp), -1);
88
          Tcl_Write(errChannel, "\n", 1);
88
          Tcl_Write(errChannel, "\n", 1);
89
        }
89
        }
90
        Tcl_AddErrorInfo(Interp,
90
        Tcl_AddErrorInfo(Interp,
Lines 1055-1061 Link Here
1055
  mainWindow =
1055
  mainWindow =
1056
  Tk_MainWindow(interp) ;
1056
  Tk_MainWindow(interp) ;
1057
  if (mainWindow == NULL) {
1057
  if (mainWindow == NULL) {
1058
    fprintf(stderr, "%s\n", interp->result);
1058
    fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
1059
    exit(1);
1059
    exit(1);
1060
  }
1060
  }
1061
  Tk_Name(mainWindow) =
1061
  Tk_Name(mainWindow) =
Lines 2061-2067 Link Here
2061
      Standard_Integer res = Tk_Init (interp);
2061
      Standard_Integer res = Tk_Init (interp);
2062
      if (res != TCL_OK)
2062
      if (res != TCL_OK)
2063
      {
2063
      {
2064
        cout << "tkLoop: error in Tk initialization. Tcl reported: " << interp->result << endl;
2064
        cout << "tkLoop: error in Tk initialization. Tcl reported: " << Tcl_GetStringResult(interp) << endl;
2065
      }
2065
      }
2066
    }
2066
    }
2067
    catch (Standard_Failure)
2067
    catch (Standard_Failure)
Lines 2072-2078 Link Here
2072
    mainWindow = Tk_MainWindow (interp);
2072
    mainWindow = Tk_MainWindow (interp);
2073
    if (mainWindow == NULL)
2073
    if (mainWindow == NULL)
2074
    {
2074
    {
2075
      fprintf (stderr, "%s\n", interp->result);
2075
      fprintf (stderr, "%s\n", Tcl_GetStringResult(interp));
2076
      cout << "tkLoop: Tk_MainWindow() returned NULL. Exiting...\n";
2076
      cout << "tkLoop: Tk_MainWindow() returned NULL. Exiting...\n";
2077
      Tcl_Exit (0);
2077
      Tcl_Exit (0);
2078
    }
2078
    }

Return to bug 451406