some common code moved from wxWindow/wxFrame into files in common subdir

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 59e2c3c868b6a9afca270c0b6fc5992afd7fc8aa..19985714d31510ff15cc37baab8b0a3db89c6942 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -3,11 +3,13 @@
 // Purpose:     common (for all platforms) wxFrame functions
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97
 // Purpose:     common (for all platforms) wxFrame functions
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97

-// Id:
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#include "wx/frame.h"
+

 void wxFrame::OnIdle(wxIdleEvent& event)
 {
   DoMenuUpdates();
 void wxFrame::OnIdle(wxIdleEvent& event)
 {
   DoMenuUpdates();

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 9783cb3ca330c2660d1099eea200aa068f859c57..28fd6ab1d1c31db41d8468fd9fb78cfa4116ce9a 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -9,6 +9,9 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+#include "wx/defs.h"
+#include "wx/window.h"
+

 // Do Update UI processing for child controls
 
 // TODO: should this be implemented for the child window rather
 // Do Update UI processing for child controls
 
 // TODO: should this be implemented for the child window rather

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index f0c22d5db0909ac6f5116e1684b73b95030d328b..bd1ea693e260463b49143e309b95bebe8a8df67c 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -372,5 +372,3 @@ void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW)
   //     no idea about what incW might be
   gtk_widget_set_usize(m_widget, minW, minH);
 }
   //     no idea about what incW might be
   gtk_widget_set_usize(m_widget, minW, minH);
 }

-
-#include "../common/framecmn.cpp"

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index d62e1887230ed46d963e6235a73527ea80c775d7..37023c65c9ece8df72d3969e15563ec021c35533 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2433,5 +2433,3 @@ void wxWindow::OnIdle(wxIdleEvent& event)
 {
   UpdateWindowUI();
 }
 {
   UpdateWindowUI();
 }

-
-#include "../common/wincmn.cpp"

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index f0c22d5db0909ac6f5116e1684b73b95030d328b..bd1ea693e260463b49143e309b95bebe8a8df67c 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -372,5 +372,3 @@ void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW)
   //     no idea about what incW might be
   gtk_widget_set_usize(m_widget, minW, minH);
 }
   //     no idea about what incW might be
   gtk_widget_set_usize(m_widget, minW, minH);
 }

-
-#include "../common/framecmn.cpp"

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index d62e1887230ed46d963e6235a73527ea80c775d7..37023c65c9ece8df72d3969e15563ec021c35533 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2433,5 +2433,3 @@ void wxWindow::OnIdle(wxIdleEvent& event)
 {
   UpdateWindowUI();
 }
 {
   UpdateWindowUI();
 }

-
-#include "../common/wincmn.cpp"