From ffdbfc4a7647556f83b9534a1faad71136fcff2a Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Mon, 1 Jan 2007 19:49:10 +0000
Subject: [PATCH] remove inline from declaration of functions which are not
 inline

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/aui/tabmdi.h       | 2 +-
 include/wx/generic/splitter.h | 8 ++++----
 include/wx/msw/treectrl.h     | 6 +++---
 src/common/docview.cpp        | 1 -
 src/common/tarstrm.cpp        | 2 +-
 src/common/zipstrm.cpp        | 6 +++---
 src/msw/ole/droptgt.cpp       | 2 +-
 src/msw/registry.cpp          | 2 +-
 8 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index 43b9479bb7..ac4af06e70 100644
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -74,7 +74,7 @@ public:
     virtual bool ProcessEvent(wxEvent& event);
 
     wxAuiMDIChildFrame *GetActiveChild() const;
-    inline void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
+    void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
 
     wxAuiMDIClientWindow *GetClientWindow() const;
     virtual wxAuiMDIClientWindow *OnCreateClient();
diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 4d1f25d8a9..db76b8e309 100644
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __SPLITTERH_G__
-#define __SPLITTERH_G__
+#ifndef _WX_GENERIC_SPLITTER_H_
+#define _WX_GENERIC_SPLITTER_H_
 
 #include "wx/window.h"                      // base class declaration
 #include "wx/containr.h"                    // wxControlContainer
@@ -226,7 +226,7 @@ protected:
 
     // send the given event, return false if the event was processed and vetoed
     // by the user code
-    inline bool DoSendEvent(wxSplitterEvent& event);
+    bool DoSendEvent(wxSplitterEvent& event);
 
     // common part of all ctors
     void Init();
@@ -403,4 +403,4 @@ typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
 #define EVT_SPLITTER_UNSPLIT(id, fn) \
     wx__DECLARE_SPLITTEREVT(UNSPLIT, id, fn)
 
-#endif // __SPLITTERH_G__
+#endif // _WX_GENERIC_SPLITTER_H_
diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index cc9e17c60c..88b118bad9 100644
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -273,10 +273,10 @@ private:
     void Init();
 
     // helper functions
-    inline bool DoGetItem(wxTreeViewItem *tvItem) const;
-    inline void DoSetItem(wxTreeViewItem *tvItem);
+    bool DoGetItem(wxTreeViewItem *tvItem) const;
+    void DoSetItem(wxTreeViewItem *tvItem);
 
-    inline void DoExpand(const wxTreeItemId& item, int flag);
+    void DoExpand(const wxTreeItemId& item, int flag);
 
     void DeleteTextCtrl();
 
diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 0e26b04b6b..ea677c4487 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -95,7 +95,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
 // function prototypes
 // ----------------------------------------------------------------------------
 
-static inline wxString FindExtension(const wxChar *path);
 static wxWindow* wxFindSuitableParent(void);
 
 // ----------------------------------------------------------------------------
diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index c7cdf1e183..fb4011cb96 100644
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -133,7 +133,7 @@ public:
 
     bool Read(wxInputStream& in);
     bool Write(wxOutputStream& out);
-    inline bool WriteField(wxOutputStream& out, int id);
+    bool WriteField(wxOutputStream& out, int id);
 
     bool IsAllZeros() const;
     wxUint32 Sum(bool SignedSum = false);
diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index eff8cc54f0..fae269024c 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -173,9 +173,9 @@ class wxZipHeader
 public:
     wxZipHeader(wxInputStream& stream, size_t size);
 
-    inline wxUint8 Read8();
-    inline wxUint16 Read16();
-    inline wxUint32 Read32();
+    wxUint8 Read8();
+    wxUint16 Read16();
+    wxUint32 Read32();
 
     const char *GetData() const             { return m_data; }
     size_t GetSize() const                  { return m_size; }
diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp
index 84d718ff17..be6d4fcdfb 100644
--- a/src/msw/ole/droptgt.cpp
+++ b/src/msw/ole/droptgt.cpp
@@ -80,7 +80,7 @@ protected:
     HWND          m_hwnd;         // window we're associated with
 
     // get default drop effect for given keyboard flags
-    static inline DWORD GetDropEffect(DWORD flags, wxDragResult defaultAction);
+    static DWORD GetDropEffect(DWORD flags, wxDragResult defaultAction);
 
     DECLARE_NO_COPY_CLASS(wxIDropTarget)
 };
diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp
index 674ebaf3a3..3c31939c81 100644
--- a/src/msw/registry.cpp
+++ b/src/msw/registry.cpp
@@ -108,7 +108,7 @@ aStdKeys[] =
 // ----------------------------------------------------------------------------
 
 // removes the trailing backslash from the string if it has one
-static inline void RemoveTrailingSeparator(wxString& str);
+static void RemoveTrailingSeparator(wxString& str);
 
 // returns true if given registry key exists
 static bool KeyExists(WXHKEY hRootKey, const wxChar *szKey);
-- 
2.45.2