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

Warning fixes for MinGW.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-01-21 18:15:42 +00:00
parent 77670008aa
commit ef359b4350
11 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/dialog.h
View File

@@ -18,7 +18,7 @@
#include "wx/panel.h" #include "wx/panel.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr;
class WXDLLEXPORT wxDialogModalData; class WXDLLEXPORT wxDialogModalData;

2
include/wx/msw/gauge95.h
View File

@@ -18,7 +18,7 @@
#if wxUSE_GAUGE #if wxUSE_GAUGE
WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; extern WXDLLEXPORT_DATA(const wxChar*) wxGaugeNameStr;
// Group box // Group box
class WXDLLEXPORT wxGauge95 : public wxGaugeBase class WXDLLEXPORT wxGauge95 : public wxGaugeBase

8
include/wx/msw/mdi.h
View File

@@ -18,8 +18,8 @@
#include "wx/frame.h" #include "wx/frame.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr;
class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIClientWindow;
class WXDLLEXPORT wxMDIChildFrame; class WXDLLEXPORT wxMDIChildFrame;
@@ -70,7 +70,7 @@ public:
wxMenu* GetWindowMenu() const { return m_windowMenu; }; wxMenu* GetWindowMenu() const { return m_windowMenu; };
void SetWindowMenu(wxMenu* menu) ; void SetWindowMenu(wxMenu* menu) ;
virtual void DoMenuUpdates(wxMenu* menu = NULL); virtual void DoMenuUpdates(wxMenu* menu = NULL);
// MDI operations // MDI operations
// -------------- // --------------
virtual void Cascade(); virtual void Cascade();
@@ -174,7 +174,7 @@ public:
bool ResetWindowStyle(void *vrect); bool ResetWindowStyle(void *vrect);
void OnIdle(wxIdleEvent& event); void OnIdle(wxIdleEvent& event);
virtual bool Show(bool show = true); virtual bool Show(bool show = true);
protected: protected:

2
include/wx/msw/msgdlg.h
View File

@@ -23,7 +23,7 @@
* Message box dialog * Message box dialog
*/ */
WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr; extern WXDLLEXPORT_DATA(const wxChar*) wxMessageBoxCaptionStr;
class WXDLLEXPORT wxMessageDialog: public wxDialog class WXDLLEXPORT wxMessageDialog: public wxDialog
{ {

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

@@ -44,13 +44,13 @@ class WXDLLEXPORT wxWindow;
#if wxUSE_GUI #if wxUSE_GUI
WXDLLEXPORT_DATA(extern HICON) wxSTD_FRAME_ICON; extern WXDLLEXPORT_DATA(HICON) wxSTD_FRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxSTD_MDIPARENTFRAME_ICON; extern WXDLLEXPORT_DATA(HICON) wxSTD_MDIPARENTFRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxSTD_MDICHILDFRAME_ICON; extern WXDLLEXPORT_DATA(HICON) wxSTD_MDICHILDFRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_FRAME_ICON; extern WXDLLEXPORT_DATA(HICON) wxDEFAULT_FRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON; extern WXDLLEXPORT_DATA(HICON) wxDEFAULT_MDIPARENTFRAME_ICON;
WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON; extern WXDLLEXPORT_DATA(HICON) wxDEFAULT_MDICHILDFRAME_ICON;
WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; extern WXDLLEXPORT_DATA(HFONT) wxSTATUS_LINE_FONT;
#endif // wxUSE_GUI #endif // wxUSE_GUI
@@ -502,7 +502,7 @@ private:
// global data // global data
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
WXDLLIMPEXP_DATA_BASE(extern HINSTANCE) wxhInstance; extern WXDLLIMPEXP_DATA_BASE(HINSTANCE) wxhInstance;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// global functions // global functions
@@ -553,21 +553,21 @@ WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos);
WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos); WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos);
// Find maximum size of window/rectangle // 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) // 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 // 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 // get the window id (should be unsigned, hence this is not wxWindowID which
// is, for mainly historical reasons, signed) // 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 // check if hWnd's WNDPROC is wndProc. Return true if yes, false if they are
// different // different
WXDLLEXPORT extern bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc); extern WXDLLEXPORT bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc);
// Does this window style specify any border? // Does this window style specify any border?
inline bool wxStyleHasBorder(long style) 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 // this function simply checks whether the given hWnd corresponds to a wxWindow
// and returns either that window if it does or NULL otherwise // 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 // 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 // wxFindWinFromHandle() above it will also work for "sub controls" of a
// wxWindow. // wxWindow.
// //
// returns the wxWindow corresponding to the given HWND or NULL. // 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 // 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 // Lines are drawn differently for WinCE and regular WIN32
WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2); WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2);

2
include/wx/msw/statbmp.h
View File

@@ -20,7 +20,7 @@
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/bitmap.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 // a control showing an icon or a bitmap
class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase

2
include/wx/msw/tabctrl.h
View File

@@ -18,7 +18,7 @@
class WXDLLIMPEXP_CORE wxImageList; class WXDLLIMPEXP_CORE wxImageList;
// WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; // extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr;
/* /*
* Flags returned by HitTest * Flags returned by HitTest

2
include/wx/msw/tbarmsw.h
View File

@@ -20,7 +20,7 @@
#include "wx/tbarbase.h" #include "wx/tbarbase.h"
WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr; extern WXDLLEXPORT_DATA(const wxChar*) wxButtonBarNameStr;
class WXDLLEXPORT wxMemoryDC; class WXDLLEXPORT wxMemoryDC;

2
include/wx/msw/tglbtn.h
View File

@@ -13,7 +13,7 @@
#ifndef _WX_TOGGLEBUTTON_H_ #ifndef _WX_TOGGLEBUTTON_H_
#define _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_
WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr; extern WXDLLEXPORT_DATA(const wxChar*) wxCheckBoxNameStr;
// Checkbox item (single checkbox) // Checkbox item (single checkbox)
class WXDLLEXPORT wxToggleButton : public wxControl class WXDLLEXPORT wxToggleButton : public wxControl

2
include/wx/univ/dialog.h
View File

@@ -15,7 +15,7 @@
#pragma interface "univdialog.h" #pragma interface "univdialog.h"
#endif #endif
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr;
class WXDLLEXPORT wxWindowDisabler; class WXDLLEXPORT wxWindowDisabler;
class WXDLLEXPORT wxEventLoop; class WXDLLEXPORT wxEventLoop;

4
include/wx/univ/theme.h
View File

@@ -52,7 +52,7 @@ public:
// get the renderer implementing all the control-drawing operations in // get the renderer implementing all the control-drawing operations in
// this theme // this theme
virtual wxRenderer *GetRenderer() = 0; virtual wxRenderer *GetRenderer() = 0;
// get the art provider to be used together with this theme // get the art provider to be used together with this theme
virtual wxArtProvider *GetArtProvider() = 0; virtual wxArtProvider *GetArtProvider() = 0;
@@ -105,7 +105,7 @@ struct WXDLLEXPORT wxThemeInfo
// without it, an over optimizing linker may discard the object module // without it, an over optimizing linker may discard the object module
// containing the theme implementation entirely // containing the theme implementation entirely
#define WX_USE_THEME(themename) \ #define WX_USE_THEME(themename) \
WXDLLEXPORT_DATA(extern bool) wxThemeUse##themename; \ extern WXDLLEXPORT_DATA(bool) wxThemeUse##themename; \
static struct wxThemeUserFor##themename \ static struct wxThemeUserFor##themename \
{ \ { \
wxThemeUserFor##themename() { wxThemeUse##themename = true; } \ wxThemeUserFor##themename() { wxThemeUse##themename = true; } \