AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove obsolete _EXPORT macro not used under Win32.

Browse Source 
This was a leftover from bad old Win16 days.
This commit is contained in:
Vadim Zeitlin 2015-06-30 18:58:58 +02:00
parent 30b523d1f2
commit 73119a37ae
15 changed files with 49 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/msw/private.h
View File

@ -99,10 +99,6 @@ WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
#define APIENTRY FAR PASCAL
#endif
#ifndef _EXPORT
#define _EXPORT
#endif
/*
* Decide what window classes we're going to use
* for this combination of CTl3D/FAFA settings
@ -140,7 +136,7 @@ WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
// Generic subclass proc, for panel item moving/sizing and intercept
// EDIT control VK_RETURN messages
extern LONG APIENTRY _EXPORT
extern LONG APIENTRY
wxSubclassedGenericControlProc(WXHWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
// ---------------------------------------------------------------------------

12
src/msw/combobox.cpp
View File

@ -75,10 +75,8 @@ wxEND_EVENT_TABLE()
// function prototypes
// ----------------------------------------------------------------------------
LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
UINT message,
WPARAM wParam,
LPARAM lParam);
LRESULT APIENTRY
wxComboEditWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
// ---------------------------------------------------------------------------
// global vars
@ -125,10 +123,8 @@ bool ShouldForwardFromEditToCombo(UINT message)
// wnd proc for subclassed edit control
// ----------------------------------------------------------------------------
LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
UINT message,
WPARAM wParam,
LPARAM lParam)
LRESULT APIENTRY
wxComboEditWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
HWND hwndCombo = ::GetParent(hWnd);
wxWindow *win = wxFindWinFromHandle((WXHWND)hwndCombo);

19
src/msw/dde.cpp
View File

@ -65,14 +65,15 @@ static wxDDEConnection *DDEFindConnection(HCONV hConv);
static void DDEDeleteConnection(HCONV hConv);
static wxDDEServer *DDEFindServer(const wxString& s);
extern "C" HDDEDATA EXPENTRY _EXPORT _DDECallback(WORD wType,
WORD wFmt,
HCONV hConv,
HSZ hsz1,
HSZ hsz2,
HDDEDATA hData,
DWORD lData1,
DWORD lData2);
extern "C" HDDEDATA EXPENTRY
_DDECallback(WORD wType,
WORD wFmt,
HCONV hConv,
HSZ hsz1,
HSZ hsz2,
HDDEDATA hData,
DWORD lData1,
DWORD lData2);
// Add topic name to atom table before using in conversations
static HSZ DDEAddAtom(const wxString& string);
@ -771,7 +772,7 @@ bool wxDDEConnection::DoAdvise(const wxString& item,
#define DDERETURN HDDEDATA
HDDEDATA EXPENTRY _EXPORT
HDDEDATA EXPENTRY
_DDECallback(WORD wType,
WORD wFmt,
HCONV hConv,

4
src/msw/glcanvas.cpp
View File

@ -35,8 +35,8 @@
#include "wx/glcanvas.h"
// from src/msw/window.cpp
LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam);
LRESULT WXDLLEXPORT APIENTRY
wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
#ifdef GL_EXT_vertex_array
#define WXUNUSED_WITHOUT_GL_EXT_vertex_array(name) name

4
src/msw/mediactrl_qt.cpp
View File

@ -45,8 +45,8 @@
extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
extern WXDLLIMPEXP_CORE const wxChar *wxCanvasClassName;
LRESULT WXDLLIMPEXP_CORE APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam);
LRESULT WXDLLIMPEXP_CORE APIENTRY
wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
//---------------------------------------------------------------------------
// Killed MSVC warnings

4
src/msw/nativdlg.cpp
View File

@ -36,8 +36,8 @@
// global functions
// ---------------------------------------------------------------------------
extern LONG APIENTRY _EXPORT wxDlgProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam);
extern LONG APIENTRY
wxDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
// ===========================================================================
// implementation

18
src/msw/notebook.cpp
View File

@ -91,10 +91,8 @@ static WXFARPROC gs_wndprocNotebookSpinBtn = (WXFARPROC)NULL;
// the pointer to standard tab control wnd proc
static WXFARPROC gs_wndprocNotebook = (WXFARPROC)NULL;
LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd,
UINT message,
WPARAM wParam,
LPARAM lParam);
LRESULT APIENTRY
wxNotebookWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
#endif // USE_NOTEBOOK_ANTIFLICKER
@ -797,10 +795,8 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
#if USE_NOTEBOOK_ANTIFLICKER
// wnd proc for the spin button
LRESULT APIENTRY _EXPORT wxNotebookSpinBtnWndProc(HWND hwnd,
UINT message,
WPARAM wParam,
LPARAM lParam)
LRESULT APIENTRY
wxNotebookSpinBtnWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
if ( message == WM_ERASEBKGND )
return 0;
@ -809,10 +805,8 @@ LRESULT APIENTRY _EXPORT wxNotebookSpinBtnWndProc(HWND hwnd,
hwnd, message, wParam, lParam);
}
LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd,
UINT message,
WPARAM wParam,
LPARAM lParam)
LRESULT APIENTRY
wxNotebookWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
return ::CallWindowProc(CASTWNDPROC gs_wndprocNotebook,
hwnd, message, wParam, lParam);

12
src/msw/radiobox.cpp
View File

@ -101,10 +101,8 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl);
// ---------------------------------------------------------------------------
// wnd proc for radio buttons
LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
UINT message,
WPARAM wParam,
LPARAM lParam);
LRESULT APIENTRY
wxRadioBtnWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
// ---------------------------------------------------------------------------
// global vars
@ -813,10 +811,8 @@ WXHRGN wxRadioBox::MSWGetRegionWithoutChildren()
// window proc for radio buttons
// ---------------------------------------------------------------------------
LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
UINT message,
WPARAM wParam,
LPARAM lParam)
LRESULT APIENTRY
wxRadioBtnWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
wxRadioBox * const radiobox = wxRadioBox::GetFromRadioButtonHWND(hwnd);

6
src/msw/spinctrl.cpp
View File

@ -90,10 +90,8 @@ SpinForTextCtrl gs_spinForTextCtrl;
// wnd proc for the buddy text ctrl
// ----------------------------------------------------------------------------
LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd,
UINT message,
WPARAM wParam,
LPARAM lParam)
LRESULT APIENTRY
wxBuddyTextWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
wxSpinCtrl * const spin = wxSpinCtrl::GetSpinForTextCtrl(hwnd);

8
src/msw/timer.cpp
View File

@ -73,8 +73,8 @@ UINT_PTR GetNewTimerId(wxMSWTimerImpl *t)
// private functions
// ----------------------------------------------------------------------------
LRESULT APIENTRY _EXPORT wxTimerWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam);
LRESULT APIENTRY
wxTimerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
// ----------------------------------------------------------------------------
// wxTimerHiddenWindowModule: used to manage the hidden window used for
@ -161,8 +161,8 @@ void wxProcessTimer(wxMSWTimerImpl& timer)
}
LRESULT APIENTRY _EXPORT wxTimerWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam)
LRESULT APIENTRY
wxTimerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
if ( message == WM_TIMER )
{

4
src/msw/toplevel.cpp
View File

@ -76,7 +76,7 @@ static inline bool IsZoomed(HWND WXUNUSED(hwnd)) { return false; }
// NB: wxDlgProc must be defined here and not in dialog.cpp because the latter
// is not included by wxUniv build which does need wxDlgProc
LONG APIENTRY _EXPORT
LONG APIENTRY
wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
// ----------------------------------------------------------------------------
@ -1430,7 +1430,7 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
}
// the DialogProc for all wxWidgets dialogs
LONG APIENTRY _EXPORT
LONG APIENTRY
wxDlgProc(HWND hDlg,
UINT message,
WPARAM WXUNUSED(wParam),

4
src/msw/utilsexc.cpp
View File

@ -333,8 +333,8 @@ static DWORD __stdcall wxExecuteThread(void *arg)
// window procedure of a hidden window which is created just to receive
// the notification message when a process exits
LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam)
LRESULT APIENTRY
wxExecuteWindowCbk(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
if ( message == wxWM_PROC_TERMINATED )
{

6
src/msw/wince/choicece.cpp
View File

@ -56,10 +56,8 @@ wxArrayChoiceSpins wxChoice::ms_allChoiceSpins;
// wnd proc for the buddy text ctrl
// ----------------------------------------------------------------------------
LRESULT APIENTRY _EXPORT wxBuddyChoiceWndProc(HWND hwnd,
UINT message,
WPARAM wParam,
LPARAM lParam)
LRESULT APIENTRY
wxBuddyChoiceWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
wxChoice *spin = (wxChoice *)wxGetWindowUserData(hwnd);

6
src/msw/wince/textctrlce.cpp
View File

@ -83,10 +83,8 @@ wxArrayTextSpins wxTextCtrl::ms_allTextSpins;
// wnd proc for the buddy text ctrl
// ----------------------------------------------------------------------------
LRESULT APIENTRY _EXPORT wxBuddyTextCtrlWndProc(HWND hwnd,
UINT message,
WPARAM wParam,
LPARAM lParam)
LRESULT APIENTRY
wxBuddyTextCtrlWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
wxTextCtrl *spin = (wxTextCtrl *)wxGetWindowUserData(hwnd);

7
src/msw/window.cpp
View File

@ -250,8 +250,8 @@ bool gs_insideCaptureChanged = false;
// ---------------------------------------------------------------------------
// the window proc for all our windows
LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam);
LRESULT WXDLLEXPORT APIENTRY
wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
#if wxDEBUG_LEVEL >= 2
@ -2727,7 +2727,8 @@ wxWindowCreationHook::~wxWindowCreationHook()
}
// Main window proc
LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
LRESULT WXDLLEXPORT APIENTRY
wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
// trace all messages: useful for the debugging but noticeably slows down
// the code so don't do it by default