[Wesnoth-cvs-commits] wesnoth/src help.cpp multiplayer_client.cpp mul...

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      04/11/03 21:46:59

Modified files:
        src            : help.cpp multiplayer_client.cpp 
                         multiplayer_client.hpp multiplayer_lobby.cpp 
                         preferences.cpp 

Log message:
        Fixed draw => draw_contents in some widgets (preview pane). (CVS 
internal, related to widget system changes)
        
        Maybe fixed a segfault when resizing MP lobbies (CVS internal, related 
to MP lobby fixes)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_client.cpp.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_client.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.cpp.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.119&tr2=1.120&r1=text&r2=text

Patches:
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.48 wesnoth/src/help.cpp:1.49
--- wesnoth/src/help.cpp:1.48   Sun Oct 31 20:50:13 2004
+++ wesnoth/src/help.cpp        Wed Nov  3 21:46:58 2004
@@ -305,7 +305,7 @@
        void handle_jump_cfg(const config &cfg);
        void handle_format_cfg(const config &cfg);
 
-       void draw();
+       void draw_contents();
 
        /// Add an item with text. If ref_dst is something else than the
        /// empty string, the text item will be underlined to show that it
@@ -2063,9 +2063,7 @@
        return total_w - curr_loc_.first;
 }
 
-void help_text_area::draw() {
-       if (!dirty())
-               return;
+void help_text_area::draw_contents() {
        SDL_Rect const &loc = location();
        SDL_Rect clip_rect = { loc.x, loc.y, text_width(), loc.h };
        bg_restore(clip_rect);
@@ -2089,7 +2087,6 @@
                }
        }
        update_rect(clip_rect);
-       set_dirty(false);
 }
 
 void help_text_area::scroll(int) {
Index: wesnoth/src/multiplayer_client.cpp
diff -u wesnoth/src/multiplayer_client.cpp:1.73 
wesnoth/src/multiplayer_client.cpp:1.74
--- wesnoth/src/multiplayer_client.cpp:1.73     Sun Oct 31 20:50:13 2004
+++ wesnoth/src/multiplayer_client.cpp  Wed Nov  3 21:46:58 2004
@@ -714,11 +714,8 @@
        }
 }
 
-void leader_preview_pane::draw()
+void leader_preview_pane::draw_contents()
 {
-       if(!dirty())
-               return;
-
        bg_restore();
 
        surface const screen = disp().video().getSurface();
@@ -779,9 +776,6 @@
 
                leader_combo_.set_location(leader_rect.x + leader_rect.w + 10, 
leader_rect.y + (leader_rect.h - leader_combo_.height()) / 2);
        }
-
-
-       set_dirty(false);
 }
 
 bool leader_preview_pane::show_above() const
Index: wesnoth/src/multiplayer_client.hpp
diff -u wesnoth/src/multiplayer_client.hpp:1.4 
wesnoth/src/multiplayer_client.hpp:1.5
--- wesnoth/src/multiplayer_client.hpp:1.4      Sat Sep 18 18:52:20 2004
+++ wesnoth/src/multiplayer_client.hpp  Wed Nov  3 21:46:58 2004
@@ -47,7 +47,7 @@
        std::string get_selected_leader();
 
 private:
-       void draw();
+       void draw_contents();
        void process();
 
        const config::child_list side_list_;
Index: wesnoth/src/multiplayer_lobby.cpp
diff -u wesnoth/src/multiplayer_lobby.cpp:1.48 
wesnoth/src/multiplayer_lobby.cpp:1.49
--- wesnoth/src/multiplayer_lobby.cpp:1.48      Mon Nov  1 18:06:36 2004
+++ wesnoth/src/multiplayer_lobby.cpp   Wed Nov  3 21:46:58 2004
@@ -387,7 +387,8 @@
                        }
 
                        if(disp.video().modeChanged()) {
-                               dlg->clear_area();
+                               if (dlg != NULL)
+                                       dlg->clear_area();
                                return CONTINUE;
                        }
 
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.119 wesnoth/src/preferences.cpp:1.120
--- wesnoth/src/preferences.cpp:1.119   Sun Oct 31 20:50:13 2004
+++ wesnoth/src/preferences.cpp Wed Nov  3 21:46:58 2004
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.119 2004/10/31 20:50:13 silene Exp $ */
+/* $Id: preferences.cpp,v 1.120 2004/11/03 21:46:58 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -632,7 +632,7 @@
 
 private:
 
-       void draw();
+       void draw_contents();
        void process_event();
        bool left_side() const { return false; }
        void set_selection(int index);
@@ -820,11 +820,8 @@
        set_gamma(gamma_slider_.value());
 }
 
-void preferences_dialog::draw()
+void preferences_dialog::draw_contents()
 {
-       if (!dirty())
-               return;
-
        SDL_Rect const &loc = location();
        if (tab_ == GENERAL_TAB) {
                font::draw_text(&disp(), loc, font::SIZE_NORMAL, 
font::NORMAL_COLOUR, scroll_label_, loc.x, loc.y);
@@ -834,8 +831,6 @@
                font::draw_text(&disp(), loc, font::SIZE_NORMAL, 
font::NORMAL_COLOUR, music_label_, loc.x, loc.y);
                font::draw_text(&disp(), loc, font::SIZE_NORMAL, 
font::NORMAL_COLOUR, sound_label_, loc.x, loc.y + 50);
        }
-
-       set_dirty(false);
 }
 
 void preferences_dialog::set_selection(int index)