bunch-o compiler bitch'n

[goodguy/history.git] / cinelerra-5.1 / cinelerra / mwindowgui.C

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index ed12ca654267b0dbce7b66ec9464669c1324a8f7..c21f83479be36845d1cf24900320a11401b41c7c 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -918,16 +918,22 @@ int MWindowGUI::visible(int64_t x1, int64_t x2, int64_t view_x1, int64_t view_x2
 }
 
 
-int MWindowGUI::show_message(char *message, int color)
+void MWindowGUI::show_message(const char *message, int color)
 {
-// printf("MWindowGUI::show_message %d: %s 0x%08x 0x%08x\n",
-// __LINE__, message, color, mwindow->theme->message_normal);
-       if(color < 0) color = mwindow->theme->message_normal;
-       statusbar->status_text->set_color(color);
-       statusbar->status_text->update(message);
-       return 0;
+       statusbar->set_message(message, color);
+}
+void MWindowGUI::set_default_message(const char *message)
+{
+       statusbar->set_default_message(message);
+}
+void MWindowGUI::reset_default_message()
+{
+       statusbar->reset_default_message();
+}
+void MWindowGUI::default_message()
+{
+       statusbar->default_message();
 }
-
 
 // Drag motion called from other window
 int MWindowGUI::drag_motion()
@@ -2277,7 +2283,7 @@ FFMpegToggle::FFMpegToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y)
 {
        this->mwindow = mwindow;
        this->mbuttons = mbuttons;
-       set_tooltip( !get_value() ? _("Try FFMpeg first") : _("Try FFMpeg last") );
+       set_tooltip(get_value() ? FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);
 }
 
 FFMpegToggle::~FFMpegToggle()
@@ -2287,10 +2293,10 @@ FFMpegToggle::~FFMpegToggle()
 int FFMpegToggle::handle_event()
 {
        int ffmpeg_early_probe = get_value();
-       set_tooltip( !ffmpeg_early_probe ?  _("Try FFMpeg first") : _("Try FFMpeg last"));
+       set_tooltip(ffmpeg_early_probe ? FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);
        mwindow->preferences->set_file_probe_armed("FFMPEG_Early", ffmpeg_early_probe);
        mwindow->preferences->set_file_probe_armed("FFMPEG_Late", !ffmpeg_early_probe);
-       
+
        mwindow->show_warning(&mwindow->preferences->warn_indexes,
                _("Changing the base codecs may require rebuilding indexes."));
        return 1;