View | Details | Raw Unified
Collapse All | Expand All

(-) wxGTK-2.4.2/include/wx/protocol/file.h.orig (-7 / +29 lines)
 Lines 354-361    Link Here 
#else
#else
    if ( conv )
    if ( conv )
    {
    {
        size_t nLen = (len != wxSTRING_MAXLEN) ? len :
        size_t nLen = ((len != wxSTRING_MAXLEN) ? len :
                          nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
                          wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0));
        wchar_t *buf = new wchar_t[nLen+1];
        wchar_t *buf = new wchar_t[nLen+1];
        wxConvUTF8.MB2WC(buf, s, nLen);
        wxConvUTF8.MB2WC(buf, s, nLen);
 Lines 203-210    Link Here 
static enum XML_Error
static enum XML_Error
doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
	 const char *end, int tok, const char *next, const char **nextPtr);
	 const char *end, int tok, const char *next, const char **nextPtr);
#ifdef XML_DTD
static enum XML_Error
static enum XML_Error
processInternalParamEntity(XML_Parser parser, ENTITY *entity);
processInternalParamEntity(XML_Parser parser, ENTITY *entity);
#endif /* XML_DTD */
static enum XML_Error
static enum XML_Error
doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
	  const char *start, const char *end, const char **endPtr);
	  const char *start, const char *end, const char **endPtr);
 Lines 850-855    Link Here 
	DocumentIndexer(Document *pdoc_, int end_) :
	DocumentIndexer(Document *pdoc_, int end_) :
		pdoc(pdoc_), end(end_) {
		pdoc(pdoc_), end(end_) {
	}
	}
  
        virtual ~DocumentIndexer() {};
	virtual char CharAt(int index) {
	virtual char CharAt(int index) {
		if (index < 0 || index >= end)
		if (index < 0 || index >= end)
 Lines 9-15    Link Here 
// Licence:     wxWindows license
// Licence:     wxWindows license
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#ifdef __GNUG__
#pragma implementation "sckfile.h"
#pragma implementation "file.h"
#endif
#endif
// For compilers that support precompilation, includes "wx.h".
// For compilers that support precompilation, includes "wx.h".
 Lines 52-57    Link Here 
class WXDLLEXPORT wxDirTraverser
class WXDLLEXPORT wxDirTraverser
{
{
public:
public:
    virtual ~wxDirTraverser() {};
    // called for each file found by wxDir::Traverse()
    // called for each file found by wxDir::Traverse()
    //
    //
    // return wxDIR_STOP or wxDIR_CONTINUE from here
    // return wxDIR_STOP or wxDIR_CONTINUE from here
 Lines 38-43    Link Here 
		strncpy(name, languageName_, sizeof(name));
		strncpy(name, languageName_, sizeof(name));
		languageName = name;
		languageName = name;
	};
	};
	virtual ~ExternalLexerModule() {};
	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
					WordList *keywordlists[], Accessor &styler) const;
					WordList *keywordlists[], Accessor &styler) const;
	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
 Lines 29-34    Link Here 
	LexerModule(int language_, LexerFunction fnLexer_, 
	LexerModule(int language_, LexerFunction fnLexer_, 
		const char *languageName_=0, LexerFunction fnFolder_=0,
		const char *languageName_=0, LexerFunction fnFolder_=0,
		const char * const wordListDescriptions_[] = NULL);
		const char * const wordListDescriptions_[] = NULL);
	virtual ~LexerModule() {};
	int GetLanguage() const { return language; }
	int GetLanguage() const { return language; }
	// -1 is returned if no WordList information is available
	// -1 is returned if no WordList information is available
 Lines 147-152    Link Here 
{
{
public:
public:
    wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
    wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
    virtual ~wxDirTraverserSimple() {};
    virtual wxDirTraverseResult OnFile(const wxString& filename)
    virtual wxDirTraverseResult OnFile(const wxString& filename)
    {
    {
 Lines 669-675    Link Here 
    wxChar key[64];
    wxChar key[64];
    const char *clr_def;
    const char *clr_def;
    bool hasMask;
    bool hasMask;
    wxXPMColourMapData clr_data;
    wxXPMColourMapData clr_data = {0, 0, 0};
    wxXPMColourMap clr_tbl;
    wxXPMColourMap clr_tbl;
    /*
    /*
 Lines 712-718    Link Here 
        }
        }
        else
        else
        {
        {
            bool isNone;
            bool isNone = false;
            if ( !GetRGBFromName(clr_def, &isNone,
            if ( !GetRGBFromName(clr_def, &isNone,
                                 &clr_data.R, &clr_data.G, &clr_data.B) )
                                 &clr_data.R, &clr_data.G, &clr_data.B) )
            {
            {
 Lines 1580-1586    Link Here 
    {
    {
        // now got a file we can write to ....
        // now got a file we can write to ....
        wxMimeTypeCommands * entries = m_aEntries[index];
        wxMimeTypeCommands * entries = m_aEntries[index];
        size_t iOpen;
        size_t iOpen = 0;
        wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
        wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
        wxString sTmp;
        wxString sTmp;
 Lines 39-44    Link Here 
public:
public:
    // constructor
    // constructor
    wxStaticLineBase() { }
    wxStaticLineBase() { }
    virtual ~wxStaticLineBase() {};
    // is the line vertical?
    // is the line vertical?
    bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
    bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
 Lines 1300-1305    Link Here 
{
{
friend class wxDateTimeHolidaysModule;
friend class wxDateTimeHolidaysModule;
public:
public:
    virtual ~wxDateTimeHolidayAuthority() {};
    // returns TRUE if the given date is a holiday
    // returns TRUE if the given date is a holiday
    static bool IsHoliday(const wxDateTime& dt);
    static bool IsHoliday(const wxDateTime& dt);
 Lines 1340-1345    Link Here 
// the holidays for this class are all Saturdays and Sundays
// the holidays for this class are all Saturdays and Sundays
class WXDLLEXPORT wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
class WXDLLEXPORT wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
{
{
public:
    virtual ~wxDateTimeWorkDays() {};
protected:
protected:
    virtual bool DoIsHoliday(const wxDateTime& dt) const;
    virtual bool DoIsHoliday(const wxDateTime& dt) const;
    virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
    virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
 Lines 193-198    Link Here 
            m_nSel = nSel;
            m_nSel = nSel;
            m_nOldSel = nOldSel;
            m_nOldSel = nOldSel;
        }
        }
    virtual ~wxNotebookEvent() {};
    // accessors
    // accessors
        // the currently selected page (-1 if none)
        // the currently selected page (-1 if none)
 Lines 1952-1957    Link Here 
        : wxEventTableEntryBase(id, idLast, fn, data),
        : wxEventTableEntryBase(id, idLast, fn, data),
        m_eventType(evType)
        m_eventType(evType)
    { }
    { }
    virtual ~wxEventTableEntry() {};
    // the reference to event type: this allows us to not care about the
    // the reference to event type: this allows us to not care about the
    // (undefined) order in which the event table entries and the event types
    // (undefined) order in which the event table entries and the event types
 Lines 785-790    Link Here 
class wxTransform2D
class wxTransform2D
{
{
public :
public :
    virtual ~wxTransform2D() {};
    virtual void                    Transform( wxPoint2DInt* pt )const  = 0;
    virtual void                    Transform( wxPoint2DInt* pt )const  = 0;
    virtual void                    Transform( wxRect2DInt* r ) const;
    virtual void                    Transform( wxRect2DInt* r ) const;
    virtual wxPoint2DInt    Transform( const wxPoint2DInt &pt ) const;
    virtual wxPoint2DInt    Transform( const wxPoint2DInt &pt ) const;
 Lines 385-390    Link Here 
                 const wxListKey& key = wxDefaultListKey)                   \
                 const wxListKey& key = wxDefaultListKey)                   \
            : wxNodeBase(list, previous, next, data, key) { }               \
            : wxNodeBase(list, previous, next, data, key) { }               \
                                                                            \
                                                                            \
        virtual ~nodetype() {};                                             \
                                                                            \
        nodetype *GetNext() const                                           \
        nodetype *GetNext() const                                           \
            { return (nodetype *)wxNodeBase::GetNext(); }                   \
            { return (nodetype *)wxNodeBase::GetNext(); }                   \
        nodetype *GetPrevious() const                                       \
        nodetype *GetPrevious() const                                       \
 Lines 411-416    Link Here 
        name& operator=(const name& list)                                   \
        name& operator=(const name& list)                                   \
            { (void) wxListBase::operator=(list); return *this; }           \
            { (void) wxListBase::operator=(list); return *this; }           \
                                                                            \
                                                                            \
        virtual ~name() {};						     \
                                                                            \
        nodetype *GetFirst() const                                          \
        nodetype *GetFirst() const                                          \
            { return (nodetype *)wxListBase::GetFirst(); }                  \
            { return (nodetype *)wxListBase::GetFirst(); }                  \
        nodetype *GetLast() const                                           \
        nodetype *GetLast() const                                           \
 Lines 35-40    Link Here 
class WXDLLEXPORT wxRadioBoxBase
class WXDLLEXPORT wxRadioBoxBase
{
{
public:
public:
    virtual ~wxRadioBoxBase() {};
    // selection
    // selection
    virtual void SetSelection(int n) = 0;
    virtual void SetSelection(int n) = 0;
    virtual int GetSelection() const = 0;
    virtual int GetSelection() const = 0;
 Lines 61-66    Link Here 
        (void)Create(window, size);
        (void)Create(window, size);
    }
    }
    virtual ~wxCaretBase() {};
    // Create() functions - same as ctor but returns the success code
    // Create() functions - same as ctor but returns the success code
    // --------------------------------------------------------------
    // --------------------------------------------------------------
 Lines 39-44    Link Here 
{
{
public:
public:
    wxClipboardBase();
    wxClipboardBase();
    virtual ~wxClipboardBase() {};
    // open the clipboard before Add/SetData() and GetData()
    // open the clipboard before Add/SetData() and GetData()
    virtual bool Open() = 0;
    virtual bool Open() = 0;
 Lines 13-19    Link Here 
#define __WX_PROTO_FILE_H__
#define __WX_PROTO_FILE_H__
#if defined(__GNUG__) && !defined(__APPLE__)
#if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "sckfile.h"
#pragma interface "file.h"
#endif
#endif
#include "wx/defs.h"
#include "wx/defs.h"