From 73119a37aedaaeb870d91a9105664d730d15b69f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 30 Jun 2015 18:58:58 +0200 Subject: [PATCH] Remove obsolete _EXPORT macro not used under Win32. This was a leftover from bad old Win16 days. --- include/wx/msw/private.h | 6 +----- src/msw/combobox.cpp | 12 ++++-------- src/msw/dde.cpp | 19 ++++++++++--------- src/msw/glcanvas.cpp | 4 ++-- src/msw/mediactrl_qt.cpp | 4 ++-- src/msw/nativdlg.cpp | 4 ++-- src/msw/notebook.cpp | 18 ++++++------------ src/msw/radiobox.cpp | 12 ++++-------- src/msw/spinctrl.cpp | 6 ++---- src/msw/timer.cpp | 8 ++++---- src/msw/toplevel.cpp | 4 ++-- src/msw/utilsexc.cpp | 4 ++-- src/msw/wince/choicece.cpp | 6 ++---- src/msw/wince/textctrlce.cpp | 6 ++---- src/msw/window.cpp | 7 ++++--- 15 files changed, 49 insertions(+), 71 deletions(-) diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 99224af9f7..10aac4ae97 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -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); // --------------------------------------------------------------------------- diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 6ea8113202..fec27e78f3 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -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); diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp index 2d13822fbb..caaf7ee366 100644 --- a/src/msw/dde.cpp +++ b/src/msw/dde.cpp @@ -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, diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp index 733f01aa6e..017d49f9ed 100644 --- a/src/msw/glcanvas.cpp +++ b/src/msw/glcanvas.cpp @@ -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 diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp index 845726352e..9e30fc2856 100644 --- a/src/msw/mediactrl_qt.cpp +++ b/src/msw/mediactrl_qt.cpp @@ -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 diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp index e7c8388db1..1322eefd3d 100644 --- a/src/msw/nativdlg.cpp +++ b/src/msw/nativdlg.cpp @@ -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 diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 6bc92fa957..5644db902d 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -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); diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index f2466ed419..c271d6babd 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -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); diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp index 7c9f617905..0d604a4bb0 100644 --- a/src/msw/spinctrl.cpp +++ b/src/msw/spinctrl.cpp @@ -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); diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index 7b335d64f1..5ac8b2adb9 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -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 ) { diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index e39f4106a1..f275bb5c10 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -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), diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index c4f8fba548..a0fbc92115 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -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 ) { diff --git a/src/msw/wince/choicece.cpp b/src/msw/wince/choicece.cpp index 04ea4850a2..4517cbd844 100644 --- a/src/msw/wince/choicece.cpp +++ b/src/msw/wince/choicece.cpp @@ -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); diff --git a/src/msw/wince/textctrlce.cpp b/src/msw/wince/textctrlce.cpp index dbc614de12..d3bc79aede 100644 --- a/src/msw/wince/textctrlce.cpp +++ b/src/msw/wince/textctrlce.cpp @@ -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); diff --git a/src/msw/window.cpp b/src/msw/window.cpp index a2489b96fe..4940d71844 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -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