From 694f70fa9c0cc8889c208020bf75b2e3861f6818 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 31 Mar 2005 19:10:26 +0000 Subject: [PATCH] Wrong #pragma interface/implementation warning fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/gizmos/splittree/tree.cpp | 3 +-- contrib/samples/gizmos/splittree/tree.h | 22 +++++++++++++--------- contrib/samples/mmedia/mmbman.cpp | 2 +- contrib/samples/mmedia/mmbman.h | 6 +++--- contrib/samples/mmedia/mmboard.cpp | 2 +- contrib/samples/mmedia/mmboard.h | 4 ++-- contrib/utils/convertrc/convert.cpp | 3 +-- contrib/utils/convertrc/convert.h | 4 ++++ contrib/utils/convertrc/rc2wxr.cpp | 3 +-- contrib/utils/convertrc/rc2wxr.h | 4 ++++ contrib/utils/convertrc/rc2xml.cpp | 3 +-- contrib/utils/convertrc/rc2xml.h | 4 ++++ 12 files changed, 36 insertions(+), 24 deletions(-) diff --git a/contrib/samples/gizmos/splittree/tree.cpp b/contrib/samples/gizmos/splittree/tree.cpp index 4a7beba3fc..e3cc5486f6 100644 --- a/contrib/samples/gizmos/splittree/tree.cpp +++ b/contrib/samples/gizmos/splittree/tree.cpp @@ -17,8 +17,7 @@ // headers // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "tree.cpp" - #pragma interface "tree.cpp" + #pragma implementation "tree.h" #endif // For compilers that support precompilation, includes "wx/wx.h". diff --git a/contrib/samples/gizmos/splittree/tree.h b/contrib/samples/gizmos/splittree/tree.h index fd939628fc..4562d8810d 100644 --- a/contrib/samples/gizmos/splittree/tree.h +++ b/contrib/samples/gizmos/splittree/tree.h @@ -12,6 +12,10 @@ #ifndef _TREE_H_ #define _TREE_H_ +#ifdef __GNUG__ + #pragma interface "tree.h" +#endif + #include "wx/wx.h" #include "wx/gizmos/splittree.h" @@ -44,9 +48,9 @@ public: protected: wxRemotelyScrolledTreeCtrl* m_tree; wxThinSplitterWindow* m_splitter; - wxSplitterScrolledWindow* m_scrolledWindow; - //wxScrolledWindow* m_scrolledWindow; - TestValueWindow* m_valueWindow; + wxSplitterScrolledWindow* m_scrolledWindow; + //wxScrolledWindow* m_scrolledWindow; + TestValueWindow* m_valueWindow; private: // any class wishing to process wxWidgets events must use this macro @@ -67,21 +71,21 @@ enum #define idTREE_CTRL 2000 #define idSPLITTER_WINDOW 2001 -#define idVALUE_WINDOW 2002 -#define idMAIN_FRAME 2003 +#define idVALUE_WINDOW 2002 +#define idMAIN_FRAME 2003 #define idSCROLLED_WINDOW 2004 class TestTree: public wxRemotelyScrolledTreeCtrl { - DECLARE_CLASS(TestTree) + DECLARE_CLASS(TestTree) public: TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition, const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS); - ~TestTree(); + ~TestTree(); DECLARE_EVENT_TABLE() protected: - wxImageList* m_imageList; + wxImageList* m_imageList; }; class TestValueWindow: public wxTreeCompanionWindow @@ -95,7 +99,7 @@ public: //// Overrides //// Events - + //// Data members protected: diff --git a/contrib/samples/mmedia/mmbman.cpp b/contrib/samples/mmedia/mmbman.cpp index 6779245f1d..9da1bea03e 100644 --- a/contrib/samples/mmedia/mmbman.cpp +++ b/contrib/samples/mmedia/mmbman.cpp @@ -10,7 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ - #pragma implementation "mmbman.cpp" + #pragma implementation "mmbman.h" #endif // ---------------------------------------------------------------------------- diff --git a/contrib/samples/mmedia/mmbman.h b/contrib/samples/mmedia/mmbman.h index d534cb8d89..e133a1dc8c 100644 --- a/contrib/samples/mmedia/mmbman.h +++ b/contrib/samples/mmedia/mmbman.h @@ -13,7 +13,7 @@ #define _MMBMAN_APP_H_ #if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "mmbman.cpp" + #pragma interface "mmbman.h" #endif #include "wx/stream.h" @@ -46,7 +46,7 @@ class MMBoardFile { virtual bool NeedWindow() = 0; virtual void SetWindow(wxWindow *window) = 0; - + virtual void Play() = 0; virtual void Pause() = 0; virtual void Resume() = 0; @@ -55,7 +55,7 @@ class MMBoardFile { virtual MMBoardTime GetPosition() = 0; virtual MMBoardTime GetLength() = 0; virtual void SetPosition(MMBoardTime btime) = 0; - + virtual bool IsStopped() = 0; virtual bool IsPaused() = 0; diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp index 4ba796c958..7b64a14b36 100644 --- a/contrib/samples/mmedia/mmboard.cpp +++ b/contrib/samples/mmedia/mmboard.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "mmboard.cpp" + #pragma implementation "mmboard.h" #endif // For compilers that support precompilation, includes "wx/wx.h". diff --git a/contrib/samples/mmedia/mmboard.h b/contrib/samples/mmedia/mmboard.h index eb8c2a3b19..10b3a55eb1 100644 --- a/contrib/samples/mmedia/mmboard.h +++ b/contrib/samples/mmedia/mmboard.h @@ -13,7 +13,7 @@ #define _MMBOARD_APP_H_ #if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "mmboard.cpp" + #pragma interface "mmboard.h" #endif // for compilers that support precompilation, includes "wx/wx.h" @@ -50,7 +50,7 @@ public: // ---------------------------- virtual bool OnInit(); - + wxUint8 TestMultimediaCaps(); }; diff --git a/contrib/utils/convertrc/convert.cpp b/contrib/utils/convertrc/convert.cpp index 5136d4490c..b0eb0e569c 100644 --- a/contrib/utils/convertrc/convert.cpp +++ b/contrib/utils/convertrc/convert.cpp @@ -6,8 +6,7 @@ */ #ifdef __GNUG__ -#pragma implementation "convert.cpp" -#pragma interface "convert.cpp" +#pragma implementation "convert.h" #endif // For compilers that support precompilation, includes "wx/wx.h". diff --git a/contrib/utils/convertrc/convert.h b/contrib/utils/convertrc/convert.h index b7ae887ec3..07043d494e 100644 --- a/contrib/utils/convertrc/convert.h +++ b/contrib/utils/convertrc/convert.h @@ -5,6 +5,10 @@ #if !defined(MAINFRAME_H) #define MAINFRAME_H +#ifdef __GNUG__ +#pragma interface "convert.h" +#endif + #include "wx/wxprec.h" diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp index 4a69441413..af389830d1 100644 --- a/contrib/utils/convertrc/rc2wxr.cpp +++ b/contrib/utils/convertrc/rc2wxr.cpp @@ -11,8 +11,7 @@ This code was used as a starting point for my rc2xml converter */ #ifdef __GNUG__ -#pragma implementation "rc2wxr.cpp" -#pragma interface "rc2wxr.cpp" +#pragma implementation "rc2wxr.h" #endif // For compilers that support precompilation, includes "wx/wx.h". diff --git a/contrib/utils/convertrc/rc2wxr.h b/contrib/utils/convertrc/rc2wxr.h index d01f76591f..d5ddb540f5 100644 --- a/contrib/utils/convertrc/rc2wxr.h +++ b/contrib/utils/convertrc/rc2wxr.h @@ -5,6 +5,10 @@ #if !defined(RC2WXR_H) #define RC2WXR_H +#ifdef __GNUG__ +#pragma interface "rc2wxr.h" +#endif + #include "wx/file.h" #include "stdio.h" diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp index 18469e83e9..ac3e7218dc 100644 --- a/contrib/utils/convertrc/rc2xml.cpp +++ b/contrib/utils/convertrc/rc2xml.cpp @@ -16,8 +16,7 @@ cross platform (wxGTK,etc) */ #ifdef __GNUG__ -#pragma implementation "rc2xml.cpp" -#pragma interface "rc2xml.cpp" +#pragma implementation "rc2xml.h" #endif // For compilers that support precompilation, includes "wx/wx.h". diff --git a/contrib/utils/convertrc/rc2xml.h b/contrib/utils/convertrc/rc2xml.h index edf6ba9551..dba5808e2b 100644 --- a/contrib/utils/convertrc/rc2xml.h +++ b/contrib/utils/convertrc/rc2xml.h @@ -5,6 +5,10 @@ #if !defined(RC2XML_H) #define RC2XML_H +#ifdef __GNUG__ +#pragma interface "rc2xml.h" +#endif + #include "wx/file.h" #include #include -- 2.45.2