Wrong #pragma interface/implementation warning fixes.

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

diff --git a/contrib/samples/gizmos/splittree/tree.cpp b/contrib/samples/gizmos/splittree/tree.cpp
index 4a7beba3fc887c0868f8c0f7eff19d617ea092fe..e3cc5486f6aa031bf850ebe6709ece9ca9bdb7d2 100644 (file)
--- a/contrib/samples/gizmos/splittree/tree.cpp
+++ b/contrib/samples/gizmos/splittree/tree.cpp
@@ -17,8 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 #ifdef __GNUG__
 // 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".
 #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 fd939628fccdf1649d1bf809693e1e8ad36d7aba..4562d8810d4462ae1cfbb7c9bf4c491ccd7a353a 100644 (file)
--- a/contrib/samples/gizmos/splittree/tree.h
+++ b/contrib/samples/gizmos/splittree/tree.h
@@ -12,6 +12,10 @@
 #ifndef _TREE_H_
 #define _TREE_H_
 
 #ifndef _TREE_H_
 #define _TREE_H_
 

+#ifdef __GNUG__
+    #pragma interface "tree.h"
+#endif
+

 #include "wx/wx.h"
 #include "wx/gizmos/splittree.h"
 
 #include "wx/wx.h"
 #include "wx/gizmos/splittree.h"
 


@@ -44,9 +48,9 @@ public:
 protected:
     wxRemotelyScrolledTreeCtrl*        m_tree;
     wxThinSplitterWindow*   m_splitter;
 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
 
 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 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
 {
 #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);
 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:
 
     DECLARE_EVENT_TABLE()
 protected:

-       wxImageList*    m_imageList;
+    wxImageList* m_imageList;

 };
 
 class TestValueWindow: public wxTreeCompanionWindow
 };
 
 class TestValueWindow: public wxTreeCompanionWindow


@@ -95,7 +99,7 @@ public:
 //// Overrides
 
 //// Events
 //// Overrides
 
 //// Events

-    
+

 //// Data members
 protected:
 
 //// Data members
 protected:
 

diff --git a/contrib/samples/mmedia/mmbman.cpp b/contrib/samples/mmedia/mmbman.cpp
index 6779245f1db568dea30ed04462bb38b284ce6d5f..9da1bea03eb09087f56edd1179ad2ed646c7e551 100644 (file)
--- a/contrib/samples/mmedia/mmbman.cpp
+++ b/contrib/samples/mmedia/mmbman.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-  #pragma implementation "mmbman.cpp"
+  #pragma implementation "mmbman.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/contrib/samples/mmedia/mmbman.h b/contrib/samples/mmedia/mmbman.h
index d534cb8d8994d93e4ebca91db369d52a65466512..e133a1dc8c0028002e88b0789f4a17cdbd9d9a80 100644 (file)
--- 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__)
 #define _MMBMAN_APP_H_
 
 #if defined(__GNUG__) && !defined(__APPLE__)

-  #pragma interface "mmbman.cpp"
+  #pragma interface "mmbman.h"

 #endif
 
 #include "wx/stream.h"
 #endif
 
 #include "wx/stream.h"


@@ -46,7 +46,7 @@ class MMBoardFile {
   virtual bool NeedWindow() = 0;
 
   virtual void SetWindow(wxWindow *window) = 0;
   virtual bool NeedWindow() = 0;
 
   virtual void SetWindow(wxWindow *window) = 0;

-  
+

   virtual void Play() = 0;
   virtual void Pause() = 0;
   virtual void Resume() = 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 MMBoardTime GetPosition() = 0;
   virtual MMBoardTime GetLength() = 0;
   virtual void SetPosition(MMBoardTime btime) = 0;

-  
+

   virtual bool IsStopped() = 0;
   virtual bool IsPaused() = 0;
 
   virtual bool IsStopped() = 0;
   virtual bool IsPaused() = 0;
 

diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
index 4ba796c9584fbff5e7c5db2353d6379a271a0e5b..7b64a14b3636695a0db51ab129dc6790a8cb04c8 100644 (file)
--- a/contrib/samples/mmedia/mmboard.cpp
+++ b/contrib/samples/mmedia/mmboard.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 #ifdef __GNUG__
 // headers
 // ----------------------------------------------------------------------------
 #ifdef __GNUG__

-    #pragma implementation "mmboard.cpp"
+    #pragma implementation "mmboard.h"

 #endif
 
 // For compilers that support precompilation, includes "wx/wx.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 eb8c2a3b19c89f9bbf871cea450db8dcf9a207e8..10b3a55eb142be5cd3ca6b5b0c287de93a738a3b 100644 (file)
--- 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__)
 #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"
 #endif
 
 // for compilers that support precompilation, includes "wx/wx.h"


@@ -50,7 +50,7 @@ public:
   // ----------------------------
 
   virtual bool OnInit();
   // ----------------------------
 
   virtual bool OnInit();

-  
+

   wxUint8 TestMultimediaCaps();
 };
 
   wxUint8 TestMultimediaCaps();
 };
 

diff --git a/contrib/utils/convertrc/convert.cpp b/contrib/utils/convertrc/convert.cpp
index 5136d4490c8c7ede87066c529e38ad02d97bd21c..b0eb0e569c5b173e30bcf5824c366681e090a02b 100644 (file)
--- a/contrib/utils/convertrc/convert.cpp
+++ b/contrib/utils/convertrc/convert.cpp
@@ -6,8 +6,7 @@
 */
 
 #ifdef __GNUG__
 */
 
 #ifdef __GNUG__

-#pragma implementation "convert.cpp"
-#pragma interface "convert.cpp"
+#pragma implementation "convert.h"

 #endif
 
 // For compilers that support precompilation, includes "wx/wx.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 b7ae887ec336f2504b141c19ce8ea79501be062e..07043d494efa4a8a110d372ea0f5c9fd9ed4a602 100644 (file)
--- a/contrib/utils/convertrc/convert.h
+++ b/contrib/utils/convertrc/convert.h
@@ -5,6 +5,10 @@
 #if !defined(MAINFRAME_H)
 #define MAINFRAME_H
 
 #if !defined(MAINFRAME_H)
 #define MAINFRAME_H
 

+#ifdef __GNUG__
+#pragma interface "convert.h"
+#endif
+

 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 
 

diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp
index 4a6944141382a3e700d9796d189ea8f26491fcb2..af389830d12864a37247888edba5bbd08159b79e 100644 (file)
--- 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__
 */
 
 #ifdef __GNUG__

-#pragma implementation "rc2wxr.cpp"
-#pragma interface "rc2wxr.cpp"
+#pragma implementation "rc2wxr.h"

 #endif
 
 // For compilers that support precompilation, includes "wx/wx.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 d01f76591ffb28e3e0bf62b07d9cae7d8ffab9ef..d5ddb540f5b2a33dc1126c722321fee97badfe97 100644 (file)
--- a/contrib/utils/convertrc/rc2wxr.h
+++ b/contrib/utils/convertrc/rc2wxr.h
@@ -5,6 +5,10 @@
 #if !defined(RC2WXR_H)
 #define RC2WXR_H
 
 #if !defined(RC2WXR_H)
 #define RC2WXR_H
 

+#ifdef __GNUG__
+#pragma interface "rc2wxr.h"
+#endif
+

 #include "wx/file.h"
 #include "stdio.h"
 
 #include "wx/file.h"
 #include "stdio.h"
 

diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp
index 18469e83e92d5634dd9b49312fb3281ec904a1ec..ac3e7218dc725f4a7d63f224665da0dfcce6fe3f 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.cpp
+++ b/contrib/utils/convertrc/rc2xml.cpp
@@ -16,8 +16,7 @@ cross platform (wxGTK,etc)
 */
 
 #ifdef __GNUG__
 */
 
 #ifdef __GNUG__

-#pragma implementation "rc2xml.cpp"
-#pragma interface "rc2xml.cpp"
+#pragma implementation "rc2xml.h"

 #endif
 
 // For compilers that support precompilation, includes "wx/wx.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 edf6ba95517efd5f0713381abb3c3b9513cfc969..dba5808e2bbc6782ad9411c6bd4ca1b46895165b 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.h
+++ b/contrib/utils/convertrc/rc2xml.h
@@ -5,6 +5,10 @@
 #if !defined(RC2XML_H)
 #define RC2XML_H
 
 #if !defined(RC2XML_H)
 #define RC2XML_H
 

+#ifdef __GNUG__
+#pragma interface "rc2xml.h"
+#endif
+

 #include "wx/file.h"
 #include <wx/ffile.h>
 #include <wx/list.h>
 #include "wx/file.h"
 #include <wx/ffile.h>
 #include <wx/list.h>