From ef359b4350a0b232dfda34b03040eab41eee2e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 21 Jan 2005 18:15:42 +0000 Subject: [PATCH] Warning fixes for MinGW. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/dialog.h | 2 +- include/wx/msw/gauge95.h | 2 +- include/wx/msw/mdi.h | 8 ++++---- include/wx/msw/msgdlg.h | 2 +- include/wx/msw/private.h | 32 ++++++++++++++++---------------- include/wx/msw/statbmp.h | 2 +- include/wx/msw/tabctrl.h | 2 +- include/wx/msw/tbarmsw.h | 2 +- include/wx/msw/tglbtn.h | 2 +- include/wx/univ/dialog.h | 2 +- include/wx/univ/theme.h | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index 81a00606e0..ecb782a668 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -18,7 +18,7 @@ #include "wx/panel.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr; class WXDLLEXPORT wxDialogModalData; diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h index 6173f60615..ed1d7e1a0f 100644 --- a/include/wx/msw/gauge95.h +++ b/include/wx/msw/gauge95.h @@ -18,7 +18,7 @@ #if wxUSE_GAUGE -WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxGaugeNameStr; // Group box class WXDLLEXPORT wxGauge95 : public wxGaugeBase diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 04705e7aa9..ec07025dd6 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -18,8 +18,8 @@ #include "wx/frame.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr; class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIChildFrame; @@ -70,7 +70,7 @@ public: wxMenu* GetWindowMenu() const { return m_windowMenu; }; void SetWindowMenu(wxMenu* menu) ; virtual void DoMenuUpdates(wxMenu* menu = NULL); - + // MDI operations // -------------- virtual void Cascade(); @@ -174,7 +174,7 @@ public: bool ResetWindowStyle(void *vrect); void OnIdle(wxIdleEvent& event); - + virtual bool Show(bool show = true); protected: diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h index 6732bf7add..2cb0695bb4 100644 --- a/include/wx/msw/msgdlg.h +++ b/include/wx/msw/msgdlg.h @@ -23,7 +23,7 @@ * Message box dialog */ -WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxMessageBoxCaptionStr; class WXDLLEXPORT wxMessageDialog: public wxDialog { diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 503f119bed..bd6eec5dc8 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -44,13 +44,13 @@ class WXDLLEXPORT wxWindow; #if wxUSE_GUI -WXDLLEXPORT_DATA(extern HICON) wxSTD_FRAME_ICON; -WXDLLEXPORT_DATA(extern HICON) wxSTD_MDIPARENTFRAME_ICON; -WXDLLEXPORT_DATA(extern HICON) wxSTD_MDICHILDFRAME_ICON; -WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_FRAME_ICON; -WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON; -WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON; -WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; +extern WXDLLEXPORT_DATA(HICON) wxSTD_FRAME_ICON; +extern WXDLLEXPORT_DATA(HICON) wxSTD_MDIPARENTFRAME_ICON; +extern WXDLLEXPORT_DATA(HICON) wxSTD_MDICHILDFRAME_ICON; +extern WXDLLEXPORT_DATA(HICON) wxDEFAULT_FRAME_ICON; +extern WXDLLEXPORT_DATA(HICON) wxDEFAULT_MDIPARENTFRAME_ICON; +extern WXDLLEXPORT_DATA(HICON) wxDEFAULT_MDICHILDFRAME_ICON; +extern WXDLLEXPORT_DATA(HFONT) wxSTATUS_LINE_FONT; #endif // wxUSE_GUI @@ -502,7 +502,7 @@ private: // global data // --------------------------------------------------------------------------- -WXDLLIMPEXP_DATA_BASE(extern HINSTANCE) wxhInstance; +extern WXDLLIMPEXP_DATA_BASE(HINSTANCE) wxhInstance; // --------------------------------------------------------------------------- // global functions @@ -553,21 +553,21 @@ WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos); WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos); // Find maximum size of window/rectangle -WXDLLEXPORT extern void wxFindMaxSize(WXHWND hwnd, RECT *rect); +extern WXDLLEXPORT void wxFindMaxSize(WXHWND hwnd, RECT *rect); // Safely get the window text (i.e. without using fixed size buffer) -WXDLLEXPORT extern wxString wxGetWindowText(WXHWND hWnd); +extern WXDLLEXPORT wxString wxGetWindowText(WXHWND hWnd); // get the window class name -WXDLLEXPORT extern wxString wxGetWindowClass(WXHWND hWnd); +extern WXDLLEXPORT wxString wxGetWindowClass(WXHWND hWnd); // get the window id (should be unsigned, hence this is not wxWindowID which // is, for mainly historical reasons, signed) -WXDLLEXPORT extern WXWORD wxGetWindowId(WXHWND hWnd); +extern WXDLLEXPORT WXWORD wxGetWindowId(WXHWND hWnd); // check if hWnd's WNDPROC is wndProc. Return true if yes, false if they are // different -WXDLLEXPORT extern bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc); +extern WXDLLEXPORT bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc); // Does this window style specify any border? inline bool wxStyleHasBorder(long style) @@ -582,17 +582,17 @@ inline bool wxStyleHasBorder(long style) // this function simply checks whether the given hWnd corresponds to a wxWindow // and returns either that window if it does or NULL otherwise -WXDLLEXPORT extern wxWindow* wxFindWinFromHandle(WXHWND hWnd); +extern WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd); // find the window for HWND which is part of some wxWindow, i.e. unlike // wxFindWinFromHandle() above it will also work for "sub controls" of a // wxWindow. // // returns the wxWindow corresponding to the given HWND or NULL. -WXDLLEXPORT extern wxWindow *wxGetWindowFromHWND(WXHWND hwnd); +extern WXDLLEXPORT wxWindow *wxGetWindowFromHWND(WXHWND hwnd); // Get the size of an icon -WXDLLEXPORT extern wxSize wxGetHiconSize(HICON hicon); +extern WXDLLEXPORT wxSize wxGetHiconSize(HICON hicon); // Lines are drawn differently for WinCE and regular WIN32 WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2); diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index 692ad05f6f..1e5dd35fce 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -20,7 +20,7 @@ #include "wx/icon.h" #include "wx/bitmap.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h index dce65aa34f..726b8c0aa9 100644 --- a/include/wx/msw/tabctrl.h +++ b/include/wx/msw/tabctrl.h @@ -18,7 +18,7 @@ class WXDLLIMPEXP_CORE wxImageList; -// WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; +// extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr; /* * Flags returned by HitTest diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h index aa83f500bf..00015a908a 100644 --- a/include/wx/msw/tbarmsw.h +++ b/include/wx/msw/tbarmsw.h @@ -20,7 +20,7 @@ #include "wx/tbarbase.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxButtonBarNameStr; class WXDLLEXPORT wxMemoryDC; diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h index 41063456c6..b591743bde 100644 --- a/include/wx/msw/tglbtn.h +++ b/include/wx/msw/tglbtn.h @@ -13,7 +13,7 @@ #ifndef _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_ -WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxCheckBoxNameStr; // Checkbox item (single checkbox) class WXDLLEXPORT wxToggleButton : public wxControl diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h index f4a1c331b1..6d92ff6d86 100644 --- a/include/wx/univ/dialog.h +++ b/include/wx/univ/dialog.h @@ -15,7 +15,7 @@ #pragma interface "univdialog.h" #endif -WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr; class WXDLLEXPORT wxWindowDisabler; class WXDLLEXPORT wxEventLoop; diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h index 62c0d53df5..3197404bd4 100644 --- a/include/wx/univ/theme.h +++ b/include/wx/univ/theme.h @@ -52,7 +52,7 @@ public: // get the renderer implementing all the control-drawing operations in // this theme virtual wxRenderer *GetRenderer() = 0; - + // get the art provider to be used together with this theme virtual wxArtProvider *GetArtProvider() = 0; @@ -105,7 +105,7 @@ struct WXDLLEXPORT wxThemeInfo // without it, an over optimizing linker may discard the object module // containing the theme implementation entirely #define WX_USE_THEME(themename) \ - WXDLLEXPORT_DATA(extern bool) wxThemeUse##themename; \ + extern WXDLLEXPORT_DATA(bool) wxThemeUse##themename; \ static struct wxThemeUserFor##themename \ { \ wxThemeUserFor##themename() { wxThemeUse##themename = true; } \