don't export private stc2wx(), wx2stc() functions from wxSTC shared library

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

include/wx/stc/private.h

@@ -0,0 +1,40 @@
+////////////////////////////////////////////////////////////////////////////
+// Name:        wx/stc/private.h
+// Purpose:     Private declarations for wxSTC
+// Author:      Robin Dunn
+// Created:     2007-07-15
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_STC_PRIVATE_H_
+#define _WX_STC_PRIVATE_H_
+
+#include "wx/defs.h"
+#include "wx/string.h"
+
+//----------------------------------------------------------------------
+// Utility functions used within wxSTC
+
+#if wxUSE_UNICODE
+
+extern wxString stc2wx(const char* str);
+extern wxString stc2wx(const char* str, size_t len);
+extern const wxWX2MBbuf wx2stc(const wxString& str);
+
+#else // not UNICODE
+
+inline wxString stc2wx(const char* str) {
+    return wxString(str);
+}
+inline wxString stc2wx(const char* str, size_t len) {
+    return wxString(str, len);
+}
+inline const wxWX2MBbuf wx2stc(const wxString& str) {
+    return str.mbc_str();
+}
+
+#endif // UNICODE
+
+#endif // _WX_STC_PRIVATE_H_

include/wx/stc/stc.h

@@ -17,8 +17,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __stc_h__
+#ifndef _WX_STC_STC_H_
-#define __stc_h__
+#define _WX_STC_STC_H_
 
 #include "wx/defs.h"
 
@@ -3586,32 +3586,6 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #define EVT_STC_AUTOCOMP_SELECTION(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_SELECTION     id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
 #endif
 
-//----------------------------------------------------------------------
-// Utility functions used within wxSTC
-
-#ifndef SWIG
-#if wxUSE_UNICODE
-
-WXDLLIMPEXP_STC wxString stc2wx(const char* str);
-WXDLLIMPEXP_STC wxString stc2wx(const char* str, size_t len);
-WXDLLIMPEXP_STC const wxWX2MBbuf wx2stc(const wxString& str);
-
-#else // not UNICODE
-
-inline wxString stc2wx(const char* str) {
-    return wxString(str);
-}
-inline wxString stc2wx(const char* str, size_t len) {
-    return wxString(str, len);
-}
-inline const wxWX2MBbuf wx2stc(const wxString& str) {
-    return str.mbc_str();
-}
-
-#endif // UNICODE
-#endif // SWIG
-
-//----------------------------------------------------------------------
-#endif
-
 #endif // wxUSE_STC
+
+#endif // _WX_STC_STC_H_

src/stc/PlatWX.cpp

@@ -35,6 +35,7 @@
 #include "Platform.h"
 #include "PlatWX.h"
 #include "wx/stc/stc.h"
+#include "wx/stc/private.h"
 
 
 

src/stc/ScintillaWX.cpp

@@ -36,6 +36,7 @@
 #include "ScintillaWX.h"
 #include "ExternalLexer.h"
 #include "wx/stc/stc.h"
+#include "wx/stc/private.h"
 #include "PlatWX.h"
 
 #ifdef __WXMSW__

src/stc/stc.cpp

@@ -25,6 +25,7 @@
 #if wxUSE_STC
 
 #include "wx/stc/stc.h"
+#include "wx/stc/private.h"
 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"

src/stc/stc.h.in

@@ -17,8 +17,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __stc_h__
+#ifndef _WX_STC_STC_H_
-#define __stc_h__
+#define _WX_STC_STC_H_
 
 #include "wx/defs.h"
 
@@ -516,32 +516,6 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #define EVT_STC_AUTOCOMP_SELECTION(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_SELECTION     id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
 #endif
 
-//----------------------------------------------------------------------
-// Utility functions used within wxSTC
-
-#ifndef SWIG
-#if wxUSE_UNICODE
-
-WXDLLIMPEXP_STC wxString stc2wx(const char* str);
-WXDLLIMPEXP_STC wxString stc2wx(const char* str, size_t len);
-WXDLLIMPEXP_STC const wxWX2MBbuf wx2stc(const wxString& str);
-
-#else // not UNICODE
-
-inline wxString stc2wx(const char* str) {
-    return wxString(str);
-}
-inline wxString stc2wx(const char* str, size_t len) {
-    return wxString(str, len);
-}
-inline const wxWX2MBbuf wx2stc(const wxString& str) {
-    return str.mbc_str();
-}
-
-#endif // UNICODE
-#endif // SWIG
-
-//----------------------------------------------------------------------
-#endif
-
 #endif // wxUSE_STC
+
+#endif // _WX_STC_STC_H_