no changes, just de-TAB-bed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -60,9 +60,9 @@ public:
|
|||||||
bool CanGetPageSource();
|
bool CanGetPageSource();
|
||||||
wxString GetPageSource();
|
wxString GetPageSource();
|
||||||
void SetPageSource(const wxString& source, const wxString& baseUrl = wxEmptyString);
|
void SetPageSource(const wxString& source, const wxString& baseUrl = wxEmptyString);
|
||||||
wxString GetPageURL(){ return m_currentURL; }
|
wxString GetPageURL(){ return m_currentURL; }
|
||||||
void SetPageTitle(const wxString& title) { m_pageTitle = title; }
|
void SetPageTitle(const wxString& title) { m_pageTitle = title; }
|
||||||
wxString GetPageTitle(){ return m_pageTitle; }
|
wxString GetPageTitle(){ return m_pageTitle; }
|
||||||
|
|
||||||
// since these worked in 2.6, add wrappers
|
// since these worked in 2.6, add wrappers
|
||||||
void SetTitle(const wxString& title) { SetPageTitle(title); }
|
void SetTitle(const wxString& title) { SetPageTitle(title); }
|
||||||
|
@@ -116,7 +116,7 @@ protected:
|
|||||||
|
|
||||||
#define wxMessageDialog wxGenericMessageDialog
|
#define wxMessageDialog wxGenericMessageDialog
|
||||||
#elif defined(__WXCOCOA__)
|
#elif defined(__WXCOCOA__)
|
||||||
#include "wx/cocoa/msgdlg.h"
|
#include "wx/cocoa/msgdlg.h"
|
||||||
#elif defined(__WXPALMOS__)
|
#elif defined(__WXPALMOS__)
|
||||||
#include "wx/palmos/msgdlg.h"
|
#include "wx/palmos/msgdlg.h"
|
||||||
#elif defined(__WXMSW__)
|
#elif defined(__WXMSW__)
|
||||||
|
@@ -196,23 +196,23 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
void Init()
|
void Init()
|
||||||
{
|
{
|
||||||
m_pCanvas = NULL;
|
m_pCanvas = NULL;
|
||||||
m_hOldBitmap = 0;
|
m_hOldBitmap = 0;
|
||||||
m_hOldPen = 0;
|
m_hOldPen = 0;
|
||||||
m_hOldBrush = 0;
|
m_hOldBrush = 0;
|
||||||
m_hOldFont = 0;
|
m_hOldFont = 0;
|
||||||
#if wxUSE_PALETTE
|
#if wxUSE_PALETTE
|
||||||
m_hOldPalette = 0;
|
m_hOldPalette = 0;
|
||||||
#endif // wxUSE_PALETTE
|
#endif // wxUSE_PALETTE
|
||||||
|
|
||||||
m_bOwnsDC = false;
|
m_bOwnsDC = false;
|
||||||
m_hDC = 0;
|
m_hDC = 0;
|
||||||
m_hOldPS = NULL;
|
m_hOldPS = NULL;
|
||||||
m_hPS = NULL;
|
m_hPS = NULL;
|
||||||
m_bIsPaintTime = false; // True at Paint Time
|
m_bIsPaintTime = false; // True at Paint Time
|
||||||
|
|
||||||
m_pen.SetColour(*wxBLACK);
|
m_pen.SetColour(*wxBLACK);
|
||||||
m_brush.SetColour(*wxWHITE);
|
m_brush.SetColour(*wxWHITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
// create an uninitialized DC: this should be only used by the derived
|
// create an uninitialized DC: this should be only used by the derived
|
||||||
|
@@ -118,7 +118,7 @@ public:
|
|||||||
// Supply origin and extent (recommended).
|
// Supply origin and extent (recommended).
|
||||||
// Then don't need to supply them to wxMakeMetaFilePlaceable.
|
// Then don't need to supply them to wxMakeMetaFilePlaceable.
|
||||||
wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
|
wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
|
||||||
: wxDC(new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg ))
|
: wxDC(new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg ))
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
wxMetafile *GetMetafile() const
|
wxMetafile *GetMetafile() const
|
||||||
|
@@ -24,8 +24,8 @@ public:
|
|||||||
wxTlsKey()
|
wxTlsKey()
|
||||||
{
|
{
|
||||||
APIRET rc = ::DosAllocThreadLocalMemory(1, &m_slot);
|
APIRET rc = ::DosAllocThreadLocalMemory(1, &m_slot);
|
||||||
if (rc != NO_ERROR)
|
if (rc != NO_ERROR)
|
||||||
m_slot = NULL;
|
m_slot = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// return true if the key was successfully allocated
|
// return true if the key was successfully allocated
|
||||||
@@ -41,7 +41,7 @@ public:
|
|||||||
bool Set(void *value)
|
bool Set(void *value)
|
||||||
{
|
{
|
||||||
m_slot = (ULONG*)value;
|
m_slot = (ULONG*)value;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// free the key
|
// free the key
|
||||||
|
@@ -34,8 +34,8 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool m_release;
|
bool m_release;
|
||||||
int m_width;
|
int m_width;
|
||||||
int m_height;
|
int m_height;
|
||||||
|
|
||||||
DECLARE_CLASS(wxWindowDCImpl)
|
DECLARE_CLASS(wxWindowDCImpl)
|
||||||
DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
|
DECLARE_NO_COPY_CLASS(wxWindowDCImpl)
|
||||||
|
@@ -59,7 +59,7 @@ public :
|
|||||||
virtual wxString GetLineText(long lineNo) const ;
|
virtual wxString GetLineText(long lineNo) const ;
|
||||||
virtual void CheckSpelling(bool WXUNUSED(check)) { }
|
virtual void CheckSpelling(bool WXUNUSED(check)) { }
|
||||||
virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle );
|
virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle );
|
||||||
} ;
|
};
|
||||||
|
|
||||||
class wxMacUnicodeTextControl : public wxMacTextControl
|
class wxMacUnicodeTextControl : public wxMacTextControl
|
||||||
{
|
{
|
||||||
@@ -88,7 +88,7 @@ public :
|
|||||||
virtual void WriteText(const wxString& str) ;
|
virtual void WriteText(const wxString& str) ;
|
||||||
|
|
||||||
protected :
|
protected :
|
||||||
virtual void CreateControl( wxTextCtrl* peer, const Rect* bounds, CFStringRef cfr );
|
virtual void CreateControl( wxTextCtrl* peer, const Rect* bounds, CFStringRef cfr );
|
||||||
|
|
||||||
// contains the tag for the content (is different for password and non-password controls)
|
// contains the tag for the content (is different for password and non-password controls)
|
||||||
OSType m_valueTag ;
|
OSType m_valueTag ;
|
||||||
|
@@ -52,8 +52,8 @@
|
|||||||
# elif defined(TARGET_OS_MAC) && TARGET_OS_MAC
|
# elif defined(TARGET_OS_MAC) && TARGET_OS_MAC
|
||||||
# undef __WXOSX_IPHONE__
|
# undef __WXOSX_IPHONE__
|
||||||
# define __WXOSX_MAC__
|
# define __WXOSX_MAC__
|
||||||
# else
|
# else
|
||||||
# error "unknown SDK, neither TARGET_OS_MAC nor TARGET_OS_IPHONE set in <TargetConditionals.h>"
|
# error "unknown SDK, neither TARGET_OS_MAC nor TARGET_OS_IPHONE set in <TargetConditionals.h>"
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -1196,10 +1196,10 @@
|
|||||||
#if (__VMS_VER < 80200000)
|
#if (__VMS_VER < 80200000)
|
||||||
# define SetReqLen(req,n,badlen) \
|
# define SetReqLen(req,n,badlen) \
|
||||||
if ((req->length + n) > (unsigned)65535) { \
|
if ((req->length + n) > (unsigned)65535) { \
|
||||||
n = badlen; \
|
n = badlen; \
|
||||||
req->length += n; \
|
req->length += n; \
|
||||||
} else \
|
} else \
|
||||||
req->length += n
|
req->length += n
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
Reference in New Issue
Block a user