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

new makefiles (part I)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-06-01 15:32:12 +00:00
parent 29f7914424
commit 88ac883a0d
206 changed files with 38605 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/cmndata.h
View File

@@ -89,6 +89,7 @@ public:
int maxSize;
};
#if wxUSE_PRINTING_ARCHITECTURE
/*
* wxPrintData
* Encapsulates printer information (not printer dialog information)
@@ -379,5 +380,7 @@ private:
wxPrintData m_printData;
};
#endif // wxUSE_PRINTING_ARCHITECTURE
#endif
// _WX_CMNDATA_H_BASE_

4
include/wx/db.h
View File

@@ -43,8 +43,8 @@
#ifdef __WXGTK__
extern "C" {
#include <../iodbc/isql.h>
#include <../iodbc/isqlext.h>
#include "../../src/iodbc/isql.h"
#include "../../src/iodbc/isqlext.h"
typedef float SFLOAT;
typedef double SDOUBLE;
typedef unsigned int UINT;

3
include/wx/expr.h
View File

@@ -29,9 +29,6 @@
#define yyoutput PROIO_yyoutput
#define yylex PROIO_yylex
#define yyerror PROIO_yyerror
#define input PROIO_input
#define unput PROIO_unput
#define yyleng PROIO_yyleng
#define yytext PROIO_yytext
#define yymorfg PROIO_yymorfg

14
include/wx/generic/helpext.h
View File

@@ -1,12 +1,13 @@
/*-*- c++ -*-********************************************************
* exthlp.h - an external help controller for wxWindows *
* helpext.h - an external help controller for wxWindows *
* *
* (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net) *
* *
* $Id$
*******************************************************************/
#ifndef WXXHELP_H
#define WXXHELP_H
#ifndef __WX_HELPEXT_H_
#define __WX_HELPEXT_H_
#if wxUSE_HELP
@@ -46,7 +47,7 @@
Lines starting with ';' will be ignored.
*/
class wxExtHelpController : public wxHTMLHelpControllerBase
class WXDLLEXPORT wxExtHelpController : public wxHTMLHelpControllerBase
{
DECLARE_CLASS(wxExtHelpController)
public:
@@ -76,5 +77,6 @@ DECLARE_CLASS(wxExtHelpController)
bool DisplayHelp(wxString const &);
};
#endif
#endif
#endif // wxUSE_HELP
#endif // __WX_HELPEXT_H_

20
include/wx/generic/helphtml.h
View File

@@ -5,8 +5,9 @@
* *
* $Id$
*******************************************************************/
#ifndef WXXHELPHTML_H
#define WXXHELPHTML_H
#ifndef __WX_HELPHTML_H_
#define __WX_HELPHTML_H_
#if wxUSE_HELP
@@ -25,7 +26,7 @@
/// Character introducing comments/documentation field in map file.
#define WXEXTHELP_COMMENTCHAR ';'
class wxExtHelpMapList;
class WXDLLEXPORT wxExtHelpMapList;
/**
@@ -47,8 +48,8 @@ class wxExtHelpMapList;
Lines starting with ';' will be ignored.
*/
class wxHTMLHelpControllerBase : public wxHelpControllerBase
{
class WXDLLEXPORT wxHTMLHelpControllerBase : public wxHelpControllerBase
{
DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
public:
wxHTMLHelpControllerBase(void);
@@ -67,7 +68,7 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
*/
virtual bool Initialize(const wxString& dir, int WXUNUSED(server))
{ return Initialize(dir); }
/** This must be called to tell the controller where to find the
documentation.
If a locale is set, look in file/localename, i.e.
@@ -79,7 +80,7 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
@return true on success
*/
virtual bool Initialize(const wxString& dir);
/** If file is "", reloads file given in Initialize.
@file Name of help directory.
@return true on success
@@ -124,5 +125,6 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
void DeleteList(void);
};
#endif
#endif
#endif // wxUSE_HELP
#endif // __WX_HELPHTML_H_

14
include/wx/generic/laywin.h
View File

@@ -19,17 +19,21 @@
#pragma interface "laywin.h"
#endif
#include "wx/sashwin.h"
#if wxUSE_SASH
#include "wx/sashwin.h"
#endif // wxUSE_SASH
const wxEventType wxEVT_QUERY_LAYOUT_INFO = wxEVT_FIRST + 1500;
const wxEventType wxEVT_CALCULATE_LAYOUT = wxEVT_FIRST + 1501;
enum wxLayoutOrientation {
enum wxLayoutOrientation
{
wxLAYOUT_HORIZONTAL,
wxLAYOUT_VERTICAL
};
enum wxLayoutAlignment {
enum wxLayoutAlignment
{
wxLAYOUT_NONE,
wxLAYOUT_TOP,
wxLAYOUT_LEFT,
@@ -128,6 +132,8 @@ typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEv
#define EVT_CALCULATE_LAYOUT(func) { wxEVT_CALCULATE_LAYOUT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCalculateLayoutEventFunction) & func, NULL },
#if wxUSE_SASH
// This is window that can remember alignment/orientation, does its own layout,
// and can provide sashes too. Useful for implementing docked windows with sashes in
// an IDE-style interface.
@@ -163,6 +169,8 @@ protected:
DECLARE_EVENT_TABLE()
};
#endif // wxUSE_SASH
class WXDLLEXPORT wxMDIParentFrame;
class WXDLLEXPORT wxFrame;

6
include/wx/generic/sashwin.h
View File

@@ -8,7 +8,7 @@
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows license
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_SASHWIN_H_G_
@@ -18,6 +18,8 @@
#pragma interface "sashwin.h"
#endif
#if wxUSE_SASH
#include "wx/defs.h"
#include "wx/window.h"
#include "wx/string.h"
@@ -210,5 +212,7 @@ typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&);
#define EVT_SASH_DRAGGED(id, fn) { wxEVT_SASH_DRAGGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL },
#define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) { wxEVT_SASH_DRAGGED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL },
#endif // wxUSE_SASH
#endif
// _WX_SASHWIN_H_G_

11
include/wx/generic/treectrl.h
View File

@@ -323,6 +323,9 @@ public:
// get the item currently selected (may return NULL if no selection)
wxTreeItemId GetSelection() const { return m_current; }
// get the items currently selected, return the number of such item
//size_t GetSelections(wxArrayTreeItems*) const;
// get the parent of this item (may return NULL if root)
wxTreeItemId GetParent(const wxTreeItemId& item) const;
@@ -400,8 +403,9 @@ public:
// remove the selection from currently selected item (if any)
void Unselect();
void UnselectAll();
// select this item
void SelectItem(const wxTreeItemId& item);
void SelectItem(const wxTreeItemId& item, bool unselect_others=true, bool extended_select=false);
// make sure this item is visible (expanding the parent item and/or
// scrolling to this item if necessary)
void EnsureVisible(const wxTreeItemId& item);
@@ -485,6 +489,11 @@ protected:
void RefreshSubtree( wxGenericTreeItem *item );
void RefreshLine( wxGenericTreeItem *item );
void SelectItemRange( wxGenericTreeItem *item1, wxGenericTreeItem *item2 );
bool TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select);
bool TagNextChildren(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select);
void UnselectAllChildren( wxGenericTreeItem *item );
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxTreeCtrl)

2
include/wx/gtk/app.h
View File

@@ -104,9 +104,11 @@ class wxApp: public wxEvtHandler
void SetPrintMode( int WXUNUSED(mode) ) {}
int GetPrintMode() const { return wxPRINT_POSTSCRIPT; }
#if wxUSE_LOG
/* override this function to create default log target of arbitrary
* user-defined classv (default implementation creates a wxLogGui object) */
virtual wxLog *CreateLogTarget();
#endif // wxUSE_LOG
// implementation

6
include/wx/gtk/frame.h
View File

@@ -62,6 +62,7 @@ public:
virtual bool Show( bool show );
virtual void Centre( int direction = wxHORIZONTAL );
#if wxUSE_STATUSBAR
virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
const wxString& name = _T("statusBar"));
virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
@@ -70,12 +71,15 @@ public:
inline void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }
virtual void SetStatusText( const wxString &text, int number = 0 );
virtual void SetStatusWidths( int n, const int widths_field[] );
#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
virtual wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1,
const wxString& name = wxToolBarNameStr);
virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
virtual wxToolBar *GetToolBar() const;
inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
#endif // wxUSE_TOOLBAR
virtual void SetMenuBar( wxMenuBar *menuBar );
virtual wxMenuBar *GetMenuBar() const;

5
include/wx/gtk/listbox.h
View File

@@ -51,7 +51,9 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr )
{
#if wxUSE_CHECKLISTBOX
m_hasCheckBoxes = FALSE;
#endif // wxUSE_CHECKLISTBOX
Create(parent, id, pos, size, n, choices, style, validator, name);
}
virtual ~wxListBox();
@@ -117,7 +119,10 @@ public:
GtkList *m_list;
wxList m_clientDataList;
wxList m_clientObjectList;
#if wxUSE_CHECKLISTBOX
bool m_hasCheckBoxes;
#endif // wxUSE_CHECKLISTBOX
};
#endif // __GTKLISTBOXH__

2
include/wx/gtk1/app.h
View File

@@ -104,9 +104,11 @@ class wxApp: public wxEvtHandler
void SetPrintMode( int WXUNUSED(mode) ) {}
int GetPrintMode() const { return wxPRINT_POSTSCRIPT; }
#if wxUSE_LOG
/* override this function to create default log target of arbitrary
* user-defined classv (default implementation creates a wxLogGui object) */
virtual wxLog *CreateLogTarget();
#endif // wxUSE_LOG
// implementation

6
include/wx/gtk1/frame.h
View File

@@ -62,6 +62,7 @@ public:
virtual bool Show( bool show );
virtual void Centre( int direction = wxHORIZONTAL );
#if wxUSE_STATUSBAR
virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
const wxString& name = _T("statusBar"));
virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
@@ -70,12 +71,15 @@ public:
inline void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }
virtual void SetStatusText( const wxString &text, int number = 0 );
virtual void SetStatusWidths( int n, const int widths_field[] );
#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
virtual wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1,
const wxString& name = wxToolBarNameStr);
virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
virtual wxToolBar *GetToolBar() const;
inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
#endif // wxUSE_TOOLBAR
virtual void SetMenuBar( wxMenuBar *menuBar );
virtual wxMenuBar *GetMenuBar() const;

5
include/wx/gtk1/listbox.h
View File

@@ -51,7 +51,9 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr )
{
#if wxUSE_CHECKLISTBOX
m_hasCheckBoxes = FALSE;
#endif // wxUSE_CHECKLISTBOX
Create(parent, id, pos, size, n, choices, style, validator, name);
}
virtual ~wxListBox();
@@ -117,7 +119,10 @@ public:
GtkList *m_list;
wxList m_clientDataList;
wxList m_clientObjectList;
#if wxUSE_CHECKLISTBOX
bool m_hasCheckBoxes;
#endif // wxUSE_CHECKLISTBOX
};
#endif // __GTKLISTBOXH__

22
include/wx/help.h
View File

@@ -1,19 +1,19 @@
#ifndef _WX_HELP_H_BASE_
#define _WX_HELP_H_BASE_
#ifdef __WXMSW__
#include "wx/msw/helpwin.h"
#else
#include "wx/generic/helpext.h"
#endif
#include "wx/helpbase.h"
#ifdef __WXMSW__
#define wxHelpController wxWinHelpController
#define sm_classwxHelpController sm_classwxWinHelpController
#else
#define wxHelpController wxExtHelpController
#define sm_classwxHelpController sm_classwxExtHelpController
#endif
#include "wx/msw/helpwin.h"
#define wxHelpController wxWinHelpController
#define sm_classwxHelpController sm_classwxWinHelpController
#else // !MSW
#include "wx/generic/helpext.h"
#define wxHelpController wxExtHelpController
#define sm_classwxHelpController sm_classwxExtHelpController
#endif // MSW/!MSW
#endif
// _WX_HELP_H_BASE_

12
include/wx/intl.h
View File

@@ -19,6 +19,8 @@
#include "wx/defs.h"
#include "wx/string.h"
#if wxUSE_INTL
// ============================================================================
// global decls
// ============================================================================
@@ -137,5 +139,15 @@ inline const wxMB2WXbuf wxGetTranslation(const wxChar *sz)
return (const wxMB2WXbuf)sz;
}
#else // !wxUSE_INTL
#ifndef WXINTL_NO_GETTEXT_MACRO
#define _(str) (str)
#endif
inline const wxChar *wxGetTranslation(const wxChar *sz) { return sz; }
#endif // wxUSE_INTL/!wxUSE_INTL
#endif
// _WX_INTLH__

102
include/wx/log.h
View File

@@ -16,6 +16,8 @@
#pragma interface "log.h"
#endif
#if wxUSE_LOG
#include <time.h> // for time_t
#include "wx/dynarray.h"
@@ -347,6 +349,21 @@ private:
// for log messages for easy redirection
// ----------------------------------------------------------------------------
// are we in 'verbose' mode?
// (note that it's often handy to change this var manually from the
// debugger, thus enabling/disabling verbose reporting for some
// parts of the program only)
WXDLLEXPORT_DATA(extern bool) g_bVerbose;
// ----------------------------------------------------------------------------
// get error code/error message from system in a portable way
// ----------------------------------------------------------------------------
// return the last system error code
WXDLLEXPORT unsigned long wxSysErrorCode();
// return the error message for given (or last if 0) error code
WXDLLEXPORT const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
// define wxLog<level>
// -------------------
@@ -355,34 +372,45 @@ extern void WXDLLEXPORT wxLog##level(const wxChar *szFormat, ...)
#define DECLARE_LOG_FUNCTION2(level, arg1) \
extern void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...)
// a generic function for all levels (level is passes as parameter)
DECLARE_LOG_FUNCTION2(Generic, wxLogLevel level);
#else // !wxUSE_LOG
// one function per each level
DECLARE_LOG_FUNCTION(FatalError);
DECLARE_LOG_FUNCTION(Error);
DECLARE_LOG_FUNCTION(Warning);
DECLARE_LOG_FUNCTION(Message);
DECLARE_LOG_FUNCTION(Info);
DECLARE_LOG_FUNCTION(Verbose);
// log functions do nothing at all
#define DECLARE_LOG_FUNCTION(level) \
inline void WXDLLEXPORT wxLog##level(const wxChar * WXUNUSED(szFormat), ...) {}
#define DECLARE_LOG_FUNCTION2(level, arg1) \
inline void WXDLLEXPORT wxLog##level(WXUNUSED(arg1), \
const wxChar *WXUNUSED(szFormat), ...) {}
// this function sends the log message to the status line of the top level
// application frame, if any
DECLARE_LOG_FUNCTION(Status);
#endif // wxUSE_LOG/!wxUSE_LOG
// this one is the same as previous except that it allows to explicitly
// specify the frame to which the output should go
DECLARE_LOG_FUNCTION2(Status, wxFrame *pFrame);
// a generic function for all levels (level is passes as parameter)
DECLARE_LOG_FUNCTION2(Generic, wxLogLevel level);
// additional one: as wxLogError, but also logs last system call error code
// and the corresponding error message if available
DECLARE_LOG_FUNCTION(SysError);
// one function per each level
DECLARE_LOG_FUNCTION(FatalError);
DECLARE_LOG_FUNCTION(Error);
DECLARE_LOG_FUNCTION(Warning);
DECLARE_LOG_FUNCTION(Message);
DECLARE_LOG_FUNCTION(Info);
DECLARE_LOG_FUNCTION(Verbose);
// and another one which also takes the error code (for those broken APIs
// that don't set the errno (like registry APIs in Win32))
DECLARE_LOG_FUNCTION2(SysError, long lErrCode);
// this function sends the log message to the status line of the top level
// application frame, if any
DECLARE_LOG_FUNCTION(Status);
// debug functions do nothing in release mode
// this one is the same as previous except that it allows to explicitly
// specify the frame to which the output should go
DECLARE_LOG_FUNCTION2(Status, wxFrame *pFrame);
// additional one: as wxLogError, but also logs last system call error code
// and the corresponding error message if available
DECLARE_LOG_FUNCTION(SysError);
// and another one which also takes the error code (for those broken APIs
// that don't set the errno (like registry APIs in Win32))
DECLARE_LOG_FUNCTION2(SysError, long lErrCode);
// debug functions do nothing in release mode
#ifdef __WXDEBUG__
DECLARE_LOG_FUNCTION(Debug);
@@ -403,34 +431,18 @@ extern void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...)
inline void wxLogTrace(const wxChar *, ...) { }
inline void wxLogTrace(wxTraceMask, const wxChar *, ...) { }
inline void wxLogTrace(const wxChar *, const wxChar *, ...) { }
#endif
#endif // debug/!debug
// are we in 'verbose' mode?
// (note that it's often handy to change this var manually from the
// debugger, thus enabling/disabling verbose reporting for some
// parts of the program only)
WXDLLEXPORT_DATA(extern bool) g_bVerbose;
// ----------------------------------------------------------------------------
// get error code/error message from system in a portable way
// ----------------------------------------------------------------------------
// return the last system error code
WXDLLEXPORT unsigned long wxSysErrorCode();
// return the error message for given (or last if 0) error code
WXDLLEXPORT const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
// ----------------------------------------------------------------------------
// debug only logging functions: use them with API name and error code
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// debug only logging functions: use them with API name and error code
// ----------------------------------------------------------------------------
#ifndef __TFILE__
#define __XFILE__(x) _T(x)
#define __TFILE__ __XFILE__(__FILE__)
#define __XFILE__(x) _T(x)
#define __TFILE__ __XFILE__(__FILE__)
#endif
#ifdef __WXDEBUG__
#if __WXDEBUG__
// make life easier for people using VC++ IDE: clicking on the message
// will take us immediately to the place of the failed API
#ifdef __VISUALC__

8
include/wx/odbc.h
View File

@@ -27,10 +27,10 @@
#ifdef __WXGTK__
extern "C" {
#include <../iodbc/isql.h>
#include <../iodbc/isqlext.h>
#include <../iodbc/odbc_funcs.h>
#include <../iodbc/odbc_types.h>
#include "../../src/iodbc/isql.h"
#include "../../src/iodbc/isqlext.h"
#include "../../src/iodbc/odbc_funcs.h"
#include "../../src/iodbc/odbc_types.h"
typedef float SFLOAT;
typedef double SDOUBLE;
#define ULONG UDWORD

8
include/wx/validate.h
View File

@@ -18,6 +18,12 @@
#include "wx/event.h"
#if defined(wxUSE_VALIDATORS) && !wxUSE_VALIDATORS
// wxWindows is compiled without support for wxValidator
class WXDLLEXPORT wxValidator;
#define wxDefaultValidator (*((wxValidator *)NULL))
#else // wxUSE_VALIDATORS
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxWindowBase;
@@ -78,5 +84,7 @@ private:
WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
#endif // wxUSE_VALIDATORS
#endif
// _WX_VALIDATEH__

4
include/wx/valtext.h
View File

@@ -16,6 +16,10 @@
#pragma interface "valtext.h"
#endif
#if defined(wxUSE_VALIDATORS) && !wxUSE_VALIDATORS
#error "wxWindows is compiled without support for wxValidator"
#endif
#include "wx/validate.h"
#define wxFILTER_NONE 0x0000

13
include/wx/window.h
View File

@@ -28,7 +28,10 @@
#include "wx/font.h" // so we can't do without them
#include "wx/colour.h"
#include "wx/region.h"
#include "wx/accel.h"
#if wxUSE_ACCEL
#include "wx/accel.h"
#endif // wxUSE_ACCEL
// ----------------------------------------------------------------------------
// forward declarations
@@ -356,10 +359,12 @@ public:
// validators and client data
// --------------------------
#if wxUSE_VALIDATORS
// a window may have an associated validator which is used to control
// user input
virtual void SetValidator( const wxValidator &validator );
virtual wxValidator *GetValidator() { return m_windowValidator; }
#endif // wxUSE_VALIDATORS
// each window may have associated client data: either a pointer to
// wxClientData object in which case it is managed by the window (i.e.
@@ -389,12 +394,14 @@ public:
virtual void InitDialog();
#if wxUSE_ACCEL
// accelerators
// ------------
virtual void SetAcceleratorTable( const wxAcceleratorTable& accel )
{ m_acceleratorTable = accel; }
wxAcceleratorTable *GetAcceleratorTable()
{ return &m_acceleratorTable; }
#endif // wxUSE_ACCEL
// dialog units translations
// -------------------------
@@ -654,8 +661,10 @@ protected:
// changed with SetEventHandler()
wxEvtHandler *m_eventHandler;
#if wxUSE_VALIDATORS
// associated validator or NULL if none
wxValidator *m_windowValidator;
#endif // wxUSE_VALIDATORS
#if wxUSE_DRAG_AND_DROP
wxDropTarget *m_dropTarget;
@@ -673,9 +682,11 @@ protected:
// the region which should be repainted in response to paint event
wxRegion m_updateRegion;
#if wxUSE_ACCEL
// the accelerator table for the window which translates key strokes into
// command events
wxAcceleratorTable m_acceleratorTable;
#endif // wxUSE_ACCEL
// user data associated with the window: either an object which will be
// deleted by the window when it's deleted or some raw pointer which we do

48
include/wx/wx.h
View File

@@ -25,6 +25,22 @@
#include "wx/dcprint.h"
#include "wx/dcscreen.h"
#include "wx/button.h"
#include "wx/menu.h"
#include "wx/app.h"
#include "wx/event.h"
#include "wx/list.h"
#include "wx/pen.h"
#include "wx/brush.h"
#include "wx/palette.h"
#include "wx/icon.h"
#include "wx/cursor.h"
#include "wx/dialog.h"
#include "wx/timer.h"
#include "wx/utils.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/cmndata.h"
#include "wx/bmpbuttn.h"
#include "wx/checkbox.h"
#include "wx/choice.h"
@@ -39,37 +55,29 @@
#include "wx/slider.h"
#include "wx/gauge.h"
#include "wx/combobox.h"
#include "wx/menu.h"
#include "wx/app.h"
#include "wx/event.h"
#include "wx/list.h"
#include "wx/pen.h"
#include "wx/brush.h"
#include "wx/palette.h"
#include "wx/icon.h"
#include "wx/cursor.h"
#include "wx/dialog.h"
#include "wx/timer.h"
#include "wx/utils.h"
#include "wx/settings.h"
#include "wx/layout.h"
#include "wx/memory.h"
#include "wx/mdi.h"
#include "wx/scrolwin.h"
#include "wx/statusbr.h"
#include "wx/scrolbar.h"
#include "wx/msgdlg.h"
#include "wx/choicdlg.h"
#include "wx/textdlg.h"
#include "wx/filedlg.h"
#include "wx/dirdlg.h"
#include "wx/cmndata.h"
#include "wx/intl.h"
#include "wx/valtext.h"
#if wxUSE_INTL
#include "wx/intl.h"
#endif // wxUSE_INTL
#if wxUSE_VALIDATORS
#include "wx/valtext.h"
#endif // wxUSE_VALIDATORS
#if wxUSE_SERIAL
#include "wx/objstrm.h"
#include "wx/serbase.h"
#endif
#include "wx/objstrm.h"
#include "wx/serbase.h"
#endif // wxUSE_SERIAL
#endif
// _WX_WXH__

6
include/wx/wxchar.h
View File

@@ -12,9 +12,9 @@
#ifndef _WX_WXCHAR_H_
#define _WX_WXCHAR_H_
#ifdef __GNUG__
#pragma interface "wxchar.h"
#endif
//#ifdef __GNUG__
//#pragma interface "wxchar.h"
//#endif
// only do SBCS or _UNICODE
#if defined (_MBCS )