From 439b3bf1f5c9a92218d84d6b8bfacb4d07a50829 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 24 Jul 1998 17:06:45 +0000 Subject: [PATCH] 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 --- src/common/framecmn.cpp | 4 +++- src/common/wincmn.cpp | 3 +++ src/gtk/frame.cpp | 2 -- src/gtk/window.cpp | 2 -- src/gtk1/frame.cpp | 2 -- src/gtk1/window.cpp | 2 -- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index 59e2c3c868..19985714d3 100644 --- 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 -// Id: +// Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "wx/frame.h" + void wxFrame::OnIdle(wxIdleEvent& event) { DoMenuUpdates(); diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 9783cb3ca3..28fd6ab1d1 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -9,6 +9,9 @@ // 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 diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index f0c22d5db0..bd1ea693e2 100644 --- 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); } - -#include "../common/framecmn.cpp" diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index d62e188723..37023c65c9 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2433,5 +2433,3 @@ void wxWindow::OnIdle(wxIdleEvent& event) { UpdateWindowUI(); } - -#include "../common/wincmn.cpp" diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index f0c22d5db0..bd1ea693e2 100644 --- 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); } - -#include "../common/framecmn.cpp" diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index d62e188723..37023c65c9 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -2433,5 +2433,3 @@ void wxWindow::OnIdle(wxIdleEvent& event) { UpdateWindowUI(); } - -#include "../common/wincmn.cpp" -- 2.45.2