Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DLL build fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-09 16:56:18 +00:00
parent f1af673620
commit b85db900cd
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/aboutdlg.h
View File

@@ -22,7 +22,7 @@
// wxAboutDialogInfo: information shown by the standard "About" dialog // wxAboutDialogInfo: information shown by the standard "About" dialog
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxAboutDialogInfo class WXDLLIMPEXP_ADV wxAboutDialogInfo
{ {
public: public:
// all fields are initially uninitialized // all fields are initially uninitialized
@@ -147,7 +147,7 @@ private:
}; };
// functions to show the about dialog box // functions to show the about dialog box
WXDLLIMPEXP_CORE void wxAboutBox(const wxAboutDialogInfo& info); WXDLLIMPEXP_ADV void wxAboutBox(const wxAboutDialogInfo& info);
#endif // wxUSE_ABOUTDLG #endif // wxUSE_ABOUTDLG

6
include/wx/generic/aboutdlgg.h
View File

@@ -17,7 +17,7 @@
#include "wx/dialog.h" #include "wx/dialog.h"
class WXDLLIMPEXP_CORE wxAboutDialogInfo; class WXDLLIMPEXP_ADV wxAboutDialogInfo;
class WXDLLIMPEXP_CORE wxSizer; class WXDLLIMPEXP_CORE wxSizer;
class WXDLLIMPEXP_CORE wxSizerFlags; class WXDLLIMPEXP_CORE wxSizerFlags;
@@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxSizerFlags;
// wxGenericAboutDialog: generic "About" dialog implementation // wxGenericAboutDialog: generic "About" dialog implementation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxGenericAboutDialog : public wxDialog class WXDLLIMPEXP_ADV wxGenericAboutDialog : public wxDialog
{ {
public: public:
// constructors and Create() method // constructors and Create() method
@@ -74,7 +74,7 @@ private:
// unlike wxAboutBox which can show either the native or generic about dialog, // unlike wxAboutBox which can show either the native or generic about dialog,
// this function always shows the generic one // this function always shows the generic one
WXDLLIMPEXP_CORE void wxGenericAboutBox(const wxAboutDialogInfo& info); WXDLLIMPEXP_ADV void wxGenericAboutBox(const wxAboutDialogInfo& info);
#endif // wxUSE_ABOUTDLG #endif // wxUSE_ABOUTDLG

1
src/common/datacmn.cpp
View File

@@ -80,7 +80,6 @@ extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[] = wxT("filedlg");
#if defined(__WXMSW__) || defined(__OS2__) #if defined(__WXMSW__) || defined(__OS2__)
WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT"); WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
#endif #endif
extern WXDLLEXPORT_DATA(const wxChar) wxHyperlinkCtrlNameStr[] = wxT("hyperlink");
extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[] = wxT("colourpicker"); extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[] = wxT("colourpicker");
extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[] = wxT("colourpickerwidget"); extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[] = wxT("colourpickerwidget");
extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerCtrlNameStr[] = wxT("fontpicker"); extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerCtrlNameStr[] = wxT("fontpicker");

2
src/generic/hyperlink.cpp
View File

@@ -53,6 +53,8 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
// reserved for internal use only // reserved for internal use only
#define wxHYPERLINKCTRL_POPUP_COPY_ID 16384 #define wxHYPERLINKCTRL_POPUP_COPY_ID 16384
const wxChar wxHyperlinkCtrlNameStr[] = wxT("hyperlink");
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxHyperlinkCtrl // wxHyperlinkCtrl
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------