No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it. Some files containing third-party sources (src/msw/wince/time.cpp, src/x11/pango*.cpp) were left unchanged. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -215,7 +215,7 @@ public:
|
||||
|
||||
virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
|
||||
wxDC *source, wxCoord xsrc, wxCoord ysrc,
|
||||
wxRasterOperationMode rop = wxCOPY, bool useMask = false,
|
||||
wxRasterOperationMode rop = wxCOPY, bool useMask = false,
|
||||
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
|
||||
|
||||
virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
|
||||
|
@@ -106,7 +106,7 @@ class WXDLLIMPEXP_CORE wxPaintDCEx : public wxPaintDC
|
||||
{
|
||||
public:
|
||||
wxPaintDCEx(wxWindow *canvas, WXHDC dc);
|
||||
|
||||
|
||||
DECLARE_CLASS(wxPaintDCEx)
|
||||
wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);
|
||||
};
|
||||
|
@@ -27,7 +27,7 @@ public:
|
||||
virtual void DoGetSize(int* width, int* height) const;
|
||||
virtual void DoSelect(const wxBitmap& bitmap);
|
||||
|
||||
virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const
|
||||
virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const
|
||||
{ return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmapOfHDC(*subrect, GetHDC() );}
|
||||
|
||||
protected:
|
||||
|
@@ -47,7 +47,7 @@ public:
|
||||
{
|
||||
Create(size, family, style, weight, underlined, face, encoding);
|
||||
}
|
||||
|
||||
|
||||
bool Create(int size,
|
||||
wxFontFamily family,
|
||||
wxFontStyle style,
|
||||
|
@@ -30,18 +30,18 @@ class WXDLLIMPEXP_CORE wxWindowsPrintNativeData: public wxPrintNativeDataBase
|
||||
public:
|
||||
wxWindowsPrintNativeData();
|
||||
virtual ~wxWindowsPrintNativeData();
|
||||
|
||||
|
||||
virtual bool TransferTo( wxPrintData &data );
|
||||
virtual bool TransferFrom( const wxPrintData &data );
|
||||
|
||||
|
||||
virtual bool Ok() const { return IsOk(); }
|
||||
virtual bool IsOk() const;
|
||||
|
||||
|
||||
void* GetDevMode() const { return m_devMode; }
|
||||
void SetDevMode(void* data) { m_devMode = data; }
|
||||
void* GetDevNames() const { return m_devNames; }
|
||||
void SetDevNames(void* data) { m_devNames = data; }
|
||||
|
||||
|
||||
private:
|
||||
void* m_devMode;
|
||||
void* m_devNames;
|
||||
@@ -51,7 +51,7 @@ private:
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
|
||||
};
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// wxWindowsPrintDialog: the MSW dialog for printing
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -76,11 +76,11 @@ private:
|
||||
wxPrinterDC* m_printerDC;
|
||||
bool m_destroyDC;
|
||||
wxWindow* m_dialogParent;
|
||||
|
||||
|
||||
private:
|
||||
bool ConvertToNative( wxPrintDialogData &data );
|
||||
bool ConvertFromNative( wxPrintDialogData &data );
|
||||
|
||||
|
||||
// holds MSW handle
|
||||
void* m_printDlg;
|
||||
|
||||
@@ -90,7 +90,7 @@ private:
|
||||
};
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// wxWindowsPageSetupDialog: the MSW page setup dialog
|
||||
// wxWindowsPageSetupDialog: the MSW page setup dialog
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase
|
||||
@@ -110,7 +110,7 @@ public:
|
||||
private:
|
||||
wxPageSetupDialogData m_pageSetupData;
|
||||
wxWindow* m_dialogParent;
|
||||
|
||||
|
||||
// holds MSW handle
|
||||
void* m_pageDlg;
|
||||
|
||||
|
@@ -123,7 +123,7 @@ protected:
|
||||
WXHWND m_hwndBuddy;
|
||||
WXFARPROC m_wndProcBuddy;
|
||||
|
||||
// Block text update event after SetValue()
|
||||
// Block text update event after SetValue()
|
||||
bool m_blockEvent;
|
||||
|
||||
// all existing wxSpinCtrls - this allows to find the one corresponding to
|
||||
|
@@ -108,7 +108,7 @@ public:
|
||||
|
||||
// Implementation from now on
|
||||
// --------------------------
|
||||
|
||||
|
||||
#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
|
||||
virtual void SetDropTarget(wxDropTarget *dropTarget);
|
||||
#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
|
||||
|
@@ -59,12 +59,12 @@ public:
|
||||
|
||||
protected:
|
||||
void Init();
|
||||
|
||||
|
||||
wxBitmap m_bitmap;
|
||||
wxBitmap m_disabledBitmap;
|
||||
bool m_capturing;
|
||||
bool m_depressed,m_oldValue;
|
||||
|
||||
|
||||
void OnPaint(wxPaintEvent &event);
|
||||
void OnMouse(wxMouseEvent &event);
|
||||
void OnChar(wxKeyEvent &event);
|
||||
|
@@ -23,10 +23,10 @@ public:
|
||||
// ctor & dtor
|
||||
wxToolTip(const wxString &tip);
|
||||
virtual ~wxToolTip();
|
||||
|
||||
|
||||
// ctor used by wxStatusBar to associate a tooltip to a portion of
|
||||
// the status bar window:
|
||||
wxToolTip(wxWindow* win, unsigned int id,
|
||||
wxToolTip(wxWindow* win, unsigned int id,
|
||||
const wxString &tip, const wxRect& rc);
|
||||
|
||||
// accessors
|
||||
|
@@ -444,9 +444,9 @@ public:
|
||||
|
||||
// check if a native double-buffering applies for this window
|
||||
virtual bool IsDoubleBuffered() const;
|
||||
|
||||
|
||||
void SetDoubleBuffered(bool on);
|
||||
|
||||
|
||||
// synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false
|
||||
void GenerateMouseLeave();
|
||||
|
||||
|
@@ -72,10 +72,10 @@
|
||||
// #undef the macros defined in winsows.h which conflict with code elsewhere
|
||||
#include "wx/msw/winundef.h"
|
||||
|
||||
// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability
|
||||
// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability
|
||||
// in the WINAPI SDK (they are an integral type that is the size of a
|
||||
// pointer) on MSVC 7 and later. However, they are not available in older
|
||||
// Platform SDKs, and since they are typedefs and not #defines we simply
|
||||
// pointer) on MSVC 7 and later. However, they are not available in older
|
||||
// Platform SDKs, and since they are typedefs and not #defines we simply
|
||||
// overwrite them if there is a chance that they're not defined
|
||||
#if (!defined(_MSC_VER) || (_MSC_VER < 1300)) && !defined(__WIN64__)
|
||||
#define UINT_PTR unsigned int
|
||||
|
Reference in New Issue
Block a user