Fix wxWrapSizer minimal size calculation.

[wxWidgets.git] / include / wx / generic / mdig.h

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index d21366b3c5f0a3d83b3886192eebf676facda8f7..a710c3f03b4216759eff3b53d5faf57eb6321ed0 100644 (file)
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -78,8 +78,6 @@ public:
     virtual void SetMenuBar(wxMenuBar *pMenuBar);
 #endif // wxUSE_MENUS
 
     virtual void SetMenuBar(wxMenuBar *pMenuBar);
 #endif // wxUSE_MENUS
 

-    virtual bool ProcessEvent(wxEvent& event);
-

     virtual wxGenericMDIClientWindow *OnCreateGenericClient();
 
 
     virtual wxGenericMDIClientWindow *OnCreateGenericClient();
 
 


@@ -112,6 +110,8 @@ private:
     void OnWindowMenu(wxCommandEvent& event);
 #endif // wxUSE_MENUS
 
     void OnWindowMenu(wxCommandEvent& event);
 #endif // wxUSE_MENUS
 

+    virtual bool ProcessEvent(wxEvent& event);
+

     void OnClose(wxCloseEvent& event);
 
     // return the client window, may be NULL if we hadn't been created yet
     void OnClose(wxCloseEvent& event);
 
     // return the client window, may be NULL if we hadn't been created yet


@@ -172,7 +172,7 @@ public:
     virtual wxString GetTitle() const { return m_title; }
     virtual void SetTitle(const wxString& title);
 
     virtual wxString GetTitle() const { return m_title; }
     virtual void SetTitle(const wxString& title);
 

-    virtual bool TryParent(wxEvent& event);
+    virtual bool TryAfter(wxEvent& event);

 
     // implementation only from now on
 
 
     // implementation only from now on