On MSW, resizing subwindows in Ruby Dialog sometimes did not work. Fixed.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/molby/trunk@476 a2be9bc6-48de-4e38-9406-05402d4bc13c

diff --git a/wxSources/RubyDialogFrame.cpp b/wxSources/RubyDialogFrame.cpp
index 01e1ebe..cd9aba2 100644 (file)
--- a/wxSources/RubyDialogFrame.cpp
+++ b/wxSources/RubyDialogFrame.cpp
@@ -37,6 +37,8 @@
 
 IMPLEMENT_DYNAMIC_CLASS(MyLayoutPanel, wxPanel)
 
+IMPLEMENT_DYNAMIC_CLASS(MyDrawingPanel, wxPanel)
+
 BEGIN_EVENT_TABLE(RubyDialogFrame, wxDialog)
   EVT_TIMER(-1, RubyDialogFrame::OnTimerEvent)
   EVT_BUTTON(wxID_OK, RubyDialogFrame::OnDefaultButtonPressed)
@@ -311,6 +313,12 @@ sResizeSubWindows(RubyValue dval, wxWindow *win, int dx, int dy)
                if (ddx != 0 || ddy != 0)
                        sResizeSubWindows(dval, current, ddx, ddy);
                current->SetSize(frame);
+#if defined(__WXMSW__)
+               if (current->IsKindOf(CLASSINFO(MyDrawingPanel))) {
+                       //  Cause repaint
+                       current->Refresh();
+               }
+#endif
        }
 }
 
@@ -789,7 +797,7 @@ RubyDialogCallback_createItem(RubyDialog *dref, const char *type, const char *ti
                tc->Connect(-1, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(RubyDialogFrame::OnDialogItemAction), NULL, parent);
        } else if (strcmp(type, "view") == 0) {
                /*  Panel  */
-               wxPanel *pn = new wxPanel(parent, -1, rect.GetPosition(), rect.GetSize());
+               MyDrawingPanel *pn = new MyDrawingPanel(parent, -1, rect.GetPosition(), rect.GetSize());
                control = pn;
                pn->Connect(-1, wxEVT_PAINT, wxPaintEventHandler(RubyDialogFrame::HandlePaintEvent), NULL, parent);
        } else if (strcmp(type, "layout_view") == 0) {
@@ -834,6 +842,11 @@ RubyDialogCallback_createItem(RubyDialog *dref, const char *type, const char *ti
                tb->Create(parent, -1, rect.GetPosition(), rect.GetSize());
                control = tb;
                tb->SetDataSource(parent);
+#if defined(__WXMSW__)
+               //  On Windows, extra resizing seems necessary to properly layout the subwindows
+               tb->SetSize(rect.width + 1, rect.height + 1);
+               tb->SetSize(rect.width, rect.height);
+#endif
        } else return NULL;
        
        if (title[0] != 0 || strcmp(type, "textfield") == 0) {

diff --git a/wxSources/RubyDialogFrame.h b/wxSources/RubyDialogFrame.h
index 9e922ba..eacce00 100644 (file)
--- a/wxSources/RubyDialogFrame.h
+++ b/wxSources/RubyDialogFrame.h
@@ -35,6 +35,16 @@ private:
        DECLARE_DYNAMIC_CLASS(MyLayoutPanel)
 };
 
+/*  MyDrawingPanel: an empty subclass of wxPanel exclusively used as "view" dialog item  */
+class MyDrawingPanel: public wxPanel {
+public:
+       MyDrawingPanel(): wxPanel() {}
+       MyDrawingPanel(wxWindow *parent, wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize): wxPanel(parent, winid, pos, size) {}
+       virtual ~MyDrawingPanel() {}            
+private:
+       DECLARE_DYNAMIC_CLASS(MyDrawingPanel)
+};
+
 class RubyDialogFrame: public wxDialog, public MyListCtrlDataSource {  
 public:
        RDItem **ditems;