Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-22 14:20:35 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-07-28 03:38:12 +00:00
parent 2259e00789
commit 1777b9bbf4
84 changed files with 546 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/wx/accel.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/accel.h"
#elif defined(__WXMAC__)
#include "wx/mac/accel.h"
#elif defined(__WXPM__)
#include "wx/os2/accel.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/accel.h"
#endif
include/wx/app.h
+2
View File
@@ -246,6 +246,8 @@ protected:
#include "wx/gtk/app.h"
#elif defined(__WXMAC__)
#include "wx/mac/app.h"
#elif defined(__WXPM__)
#include "wx/os2/app.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/app.h"
#endif
include/wx/bitmap.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/bitmap.h"
#elif defined(__WXMAC__)
#include "wx/mac/bitmap.h"
#elif defined(__WXPM__)
#include "wx/os2/bitmap.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/bitmap.h"
#endif
include/wx/bmpbuttn.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/bmpbuttn.h"
#elif defined(__WXMAC__)
#include "wx/mac/bmpbuttn.h"
#elif defined(__WXPM__)
#include "wx/os2/bmpbuttn.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/bmpbuttn.h"
#endif
include/wx/brush.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/brush.h"
#elif defined(__WXMAC__)
#include "wx/mac/brush.h"
#elif defined(__WXPM__)
#include "wx/os2/brush.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/brush.h"
#endif
include/wx/button.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/button.h"
#elif defined(__WXMAC__)
#include "wx/mac/button.h"
#elif defined(__WXPM__)
#include "wx/os2/button.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/button.h"
#endif
include/wx/checkbox.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/checkbox.h"
#elif defined(__WXMAC__)
#include "wx/mac/checkbox.h"
#elif defined(__WXPM__)
#include "wx/os2/checkbox.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/checkbox.h"
#endif
include/wx/checklst.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/checklst.h"
#elif defined(__WXMAC__)
#include "wx/mac/checklst.h"
#elif defined(__WXPM__)
#include "wx/os2/checklst.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/checklst.h"
#endif
include/wx/choice.h
+2
View File
@@ -120,6 +120,8 @@ private:
#include "wx/qt/choice.h"
#elif defined(__WXMAC__)
#include "wx/mac/choice.h"
#elif defined(__WXPM__)
#include "wx/os2/choice.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/choice.h"
#endif
include/wx/clipbrd.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/gtk/clipbrd.h"
#elif defined(__WXMAC__)
#include "wx/mac/clipbrd.h"
#elif defined(__WXPM__)
#include "wx/os2/clipbrd.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/clipbrd.h"
#endif
include/wx/cmndata.h
+2 -2
View File
@@ -21,7 +21,7 @@
#include "wx/colour.h"
#include "wx/gdicmn.h"
#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
class WXDLLEXPORT wxPrintSetupData;
#endif
@@ -156,7 +156,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
void operator=(const wxPrintData& data);
// For compatibility
#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
void operator=(const wxPrintSetupData& setupData);
#endif
include/wx/colordlg.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/generic/colrdlgg.h"
#elif defined(__WXMAC__)
#include "wx/generic/colrdlgg.h"
#elif defined(__WXPM__)
#include "wx/generic/colrdlgg.h"
#elif defined(__WXSTUBS__)
#include "wx/generic/colrdlgg.h"
#endif
include/wx/colour.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/colour.h"
#elif defined(__WXMAC__)
#include "wx/mac/colour.h"
#elif defined(__WXPM__)
#include "wx/os2/colour.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/colour.h"
#endif
include/wx/combobox.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/combobox.h"
#elif defined(__WXMAC__)
#include "wx/mac/combobox.h"
#elif defined(__WXPM__)
#include "wx/os2/combobox.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/combobox.h"
#endif
include/wx/control.h
+2
View File
@@ -62,6 +62,8 @@ protected:
#include "wx/qt/control.h"
#elif defined(__WXMAC__)
#include "wx/mac/control.h"
#elif defined(__WXPM__)
#include "wx/os2/control.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/control.h"
#endif
include/wx/cursor.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/cursor.h"
#elif defined(__WXMAC__)
#include "wx/mac/cursor.h"
#elif defined(__WXPM__)
#include "wx/os2/cursor.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/cursor.h"
#endif
include/wx/dataobj.h
+2
View File
@@ -22,6 +22,8 @@
#include "wx/qt/dnd.h"
#elif defined(__WXMAC__)
#include "wx/mac/dnd.h"
#elif defined(__WXPM__)
#include "wx/os2/dnd.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/dnd.h"
#endif
include/wx/dc.h
+2
View File
@@ -548,6 +548,8 @@ private:
#include "wx/qt/dc.h"
#elif defined(__WXMAC__)
#include "wx/mac/dc.h"
#elif defined(__WXPM__)
#include "wx/os2/dc.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/dc.h"
#endif
include/wx/dcclient.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/dcclient.h"
#elif defined(__WXMAC__)
#include "wx/mac/dcclient.h"
#elif defined(__WXPM__)
#include "wx/os2/dcclient.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/dcclient.h"
#endif
include/wx/dcmemory.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/dcmemory.h"
#elif defined(__WXMAC__)
#include "wx/mac/dcmemory.h"
#elif defined(__WXPM__)
#include "wx/os2/dcmemory.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/dcmemory.h"
#endif
include/wx/dcprint.h
+3
View File
@@ -4,6 +4,9 @@
#if defined(__WXMSW__)
#include "wx/msw/dcprint.h"
#endif
#if defined(__WXPM__)
#include "wx/os2/dcprint.h"
#endif
#endif
// _WX_DCPRINT_H_BASE_
include/wx/dcscreen.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/dcscreen.h"
#elif defined(__WXMAC__)
#include "wx/mac/dcscreen.h"
#elif defined(__WXPM__)
#include "wx/os2/dcscreen.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/dcscreen.h"
#endif
include/wx/dde.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/dde.h"
#elif defined(__WXMAC__)
#include "wx/mac/dde.h"
#elif defined(__WXPM__)
#include "wx/os2/dde.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/dde.h"
#endif
include/wx/defs.h
+34 -4
View File
@@ -68,6 +68,17 @@
#elif defined(applec) || defined(THINK_C) || ( defined( __MWERKS__ ) && !defined(__INTEL__) )
// MacOS
#elif defined(__OS2__)
#if defined(__IBMCPP__)
#define __VISAGEAVER__ __IBMCPP__
#endif
#ifndef __WXOS2__
#define __WXOS2__
#endif
#ifndef __WXPM__
#define __WXPM__
#endif
// Place other OS/2 compiler environment defines here
#else // Windows
#ifndef __WINDOWS__
#define __WINDOWS__
@@ -175,9 +186,9 @@
// Make sure the environment is set correctly
#if defined(__WXMSW__) && defined(__X__)
#error "Target can't be both X and Windows"
#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXPM__) && \
!defined(__WXMAC__) && !defined(__X__) && !defined(__WXQT__) && !defined(__WXSTUBS__)
#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXSTUBS__]"
#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXPM__|__WXSTUBS__]"
#endif
// ============================================================================
@@ -188,7 +199,7 @@
// check for native bool type and TRUE/FALSE constants
// ----------------------------------------------------------------------------
#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXSTUBS__)
#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXPM__) || defined(__WXSTUBS__)
// Bool is now obsolete, use bool instead
// typedef int Bool;
@@ -233,6 +244,9 @@
#elif defined(__GNUWIN32__)
// Cygwin supports bool
#define HAVE_BOOL
#elif defined(__VISAGECPP__)
typedef unsigned long bool;
#define HAVE_BOOL
#endif // compilers
#endif // HAVE_BOOL
@@ -263,7 +277,7 @@ typedef int wxWindowID;
* Making or using wxWindows as a Windows DLL
*/
#ifdef __WXMSW__
#if defined(__WXMSW__)
// _declspec works in BC++ 5 and later, as well as VC++
#if defined(__VISUALC__) || defined(__BORLANDC__)
@@ -282,6 +296,22 @@ typedef int wxWindowID;
# define WXDLLEXPORT_CTORFN
# endif
#elif defined(__WXPM__)
# ifdef WXMAKINGDLL
# define WXDLLEXPORT _Export
# define WXDLLEXPORT_DATA(type) _Export type
# define WXDLLEXPORT_CTORFN
# elif defined(WXUSINGDLL)
# define WXDLLEXPORT _Export
# define WXDLLEXPORT_DATA(type) _Export type
# define WXDLLEXPORT_CTORFN
# else
# define WXDLLEXPORT
# define WXDLLEXPORT_DATA(type) type
# define WXDLLEXPORT_CTORFN
# endif
#else
# define WXDLLEXPORT
# define WXDLLEXPORT_DATA(type) type
include/wx/dialog.h
+2
View File
@@ -75,6 +75,8 @@ protected:
#include "wx/qt/dialog.h"
#elif defined(__WXMAC__)
#include "wx/mac/dialog.h"
#elif defined(__WXPM__)
#include "wx/os2/dialog.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/dialog.h"
#endif
include/wx/dirdlg.h
+2
View File
@@ -15,6 +15,8 @@
#include "wx/qt/dirdlg.h"
#elif defined(__WXMAC__)
#include "wx/mac/dirdlg.h"
#elif defined(__WXPM__)
#include "wx/os2/dirdlg.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/dirdlg.h"
#endif
include/wx/dnd.h
+2
View File
@@ -13,6 +13,8 @@
#include "wx/qt/dnd.h"
#elif defined(__WXMAC__)
#include "wx/mac/dnd.h"
#elif defined(__WXPM__)
#include "wx/os2/dnd.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/dnd.h"
#endif
include/wx/dragimag.h
+2
View File
@@ -15,6 +15,8 @@
#include "wx/generic/dragimag.h"
#elif defined(__WXMAC__)
#include "wx/generic/dragimag.h"
#elif defined(__WXPM__)
#include "wx/generic/dragimag.h"
#elif defined(__WXSTUBS__)
#include "wx/generic/dragimag.h"
#endif
include/wx/dynarray.h
+3 -1
View File
@@ -44,8 +44,10 @@
must return negative value, 0 or positive value if pItem1 <, = or > pItem2
*/
#ifdef __VISUALC__
#if defined(__VISUALC__)
#define CMPFUNC_CONV _cdecl
#elif defined(__VISAGECPP__)
#define CMPFUNC_CONV _Optlink
#else // !Visual C++
#define CMPFUNC_CONV
#endif // compiler
include/wx/dynlib.h
+4
View File
@@ -42,6 +42,10 @@
#elif defined(__WINDOWS__)
# include <windows.h>
typedef HMODULE wxDllType;
#elif defined(__OS2__)
# define INCL_DOS
# include <os2.h>
typedef HMODULE wxDllType;
#elif defined(__WXMAC__)
typedef CFragConnectionID wxDllType;
#else
include/wx/filedlg.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/filedlg.h"
#elif defined(__WXMAC__)
#include "wx/mac/filedlg.h"
#elif defined(__WXPM__)
#include "wx/os2/filedlg.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/filedlg.h"
#endif
include/wx/filefn.h
+2 -2
View File
@@ -173,7 +173,7 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
#ifdef __UNIX__
#define wxFILE_SEP_PATH wxFILE_SEP_PATH_UNIX
#define wxPATH_SEP wxPATH_SEP_UNIX
#else // Windows
#else // Windows and OS/2
#define wxFILE_SEP_PATH wxFILE_SEP_PATH_DOS
#define wxPATH_SEP wxPATH_SEP_DOS
#endif // Unix/Windows
@@ -182,7 +182,7 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
// filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE)
#ifdef __UNIX__
#define wxARE_FILENAMES_CASE_SENSITIVE TRUE
#else // Windows
#else // Windows and OS/2
#define wxARE_FILENAMES_CASE_SENSITIVE FALSE
#endif // Unix/Windows
include/wx/font.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/font.h"
#elif defined(__WXMAC__)
#include "wx/mac/font.h"
#elif defined(__WXPM__)
#include "wx/os2/font.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/font.h"
#endif
include/wx/fontdlg.h
+4
View File
@@ -19,6 +19,10 @@
#include "wx/generic/fontdlgg.h"
# define wxFontDialog wxGenericFontDialog
# define sm_classwxFontDialog sm_classwxGenericFontDialog
#elif defined(__WXPM__)
#include "wx/generic/fontdlgg.h"
# define wxFontDialog wxGenericFontDialog
# define sm_classwxFontDialog sm_classwxGenericFontDialog
#elif defined(__WXSTUBS__)
#include "wx/generic/fontdlgg.h"
# define wxFontDialog wxGenericFontDialog
include/wx/frame.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/frame.h"
#elif defined(__WXMAC__)
#include "wx/mac/frame.h"
#elif defined(__WXPM__)
#include "wx/os2/frame.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/frame.h"
#endif
include/wx/gauge.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/gauge.h"
#elif defined(__WXMAC__)
#include "wx/mac/gauge.h"
#elif defined(__WXPM__)
#include "wx/os2/gauge.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/gauge.h"
#endif
include/wx/gdicmn.h
+3
View File
@@ -131,6 +131,9 @@ enum wxStockCursor
#ifdef __WXMSW__
// Load from a resource
#define wxICON(X) wxIcon("" #X "")
#elif defined(__WXPM__)
// Load from a resource
#define wxICON(X) wxIcon("" #X "")
#elif defined(__WXGTK__)
// Initialize from an included XPM
#define wxICON(X) wxIcon( (const char**) X##_xpm )
include/wx/gdiobj.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/gdiobj.h"
#elif defined(__WXMAC__)
#include "wx/mac/gdiobj.h"
#elif defined(__WXPM__)
#include "wx/os2/gdiobj.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/gdiobj.h"
#endif
include/wx/icon.h
+2
View File
@@ -17,6 +17,8 @@
#include "wx/qt/icon.h"
#elif defined(__WXMAC__)
#include "wx/mac/icon.h"
#elif defined(__WXPM__)
#include "wx/os2/icon.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/icon.h"
#endif
include/wx/imaglist.h
+2
View File
@@ -15,6 +15,8 @@
#include "wx/generic/imaglist.h"
#elif defined(__WXMAC__)
#include "wx/generic/imaglist.h"
#elif defined(__WXPM__)
#include "wx/generic/imaglist.h"
#elif defined(__WXSTUBS__)
#include "wx/generic/imaglist.h"
#endif
include/wx/joystick.h
+2
View File
@@ -9,6 +9,8 @@
#include "wx/gtk/joystick.h"
#elif defined(__WXMAC__)
#include "wx/mac/joystick.h"
#elif defined(__WXPM__)
#include "wx/os2/joystick.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/joystick.h"
#endif
include/wx/listbox.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/listbox.h"
#elif defined(__WXMAC__)
#include "wx/mac/listbox.h"
#elif defined(__WXPM__)
#include "wx/os2/listbox.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/listbox.h"
#endif
include/wx/listctrl.h
+2
View File
@@ -15,6 +15,8 @@
#include "wx/generic/listctrl.h"
#elif defined(__WXMAC__)
#include "wx/generic/listctrl.h"
#elif defined(__WXPM__)
#include "wx/generic/listctrl.h"
#elif defined(__WXSTUBS__)
#include "wx/generic/listctrl.h"
#endif
include/wx/mdi.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/mdi.h"
#elif defined(__WXMAC__)
#include "wx/mac/mdi.h"
#elif defined(__WXPM__)
#include "wx/os2/mdi.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/mdi.h"
#endif
include/wx/menu.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/menu.h"
#elif defined(__WXMAC__)
#include "wx/mac/menu.h"
#elif defined(__WXPM__)
#include "wx/os2/menu.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/menu.h"
#endif
include/wx/menuitem.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/qt/menuitem.h"
#elif defined(__WXMAC__)
#include "wx/mac/menuitem.h"
#elif defined(__WXPM__)
#include "wx/os2/menuitem.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/menuitem.h"
#endif
include/wx/metafile.h
+3
View File
@@ -4,6 +4,9 @@
#if defined(__WXMSW__)
#include "wx/msw/metafile.h"
#endif
#if defined(__WXPM__)
#include "wx/os2/metafile.h"
#endif
#endif
// _WX_METAFILE_H_BASE_
include/wx/minifram.h
+2
View File
@@ -9,6 +9,8 @@
#include "wx/gtk/minifram.h"
#elif defined(__WXMAC__)
#include "wx/mac/minifram.h"
#elif defined(__WXPM__)
#include "wx/os2/minifram.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/minifram.h"
#endif
include/wx/msgdlg.h
+2
View File
@@ -11,6 +11,8 @@
#include "wx/generic/msgdlgg.h"
#elif defined(__WXMAC__)
#include "wx/mac/msgdlg.h"
#elif defined(__WXPM__)
#include "wx/os2/msgdlg.h"
#elif defined(__WXSTUBS__)
#include "wx/generic/msgdlgg.h"
#endif
include/wx/notebook.h
+2
View File
@@ -103,6 +103,8 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
#include "wx/qt/notebook.h"
#elif defined(__WXMAC__)
#include "wx/mac/notebook.h"
#elif defined(__WXPM__)
#include "wx/os2/notebook.h"
#elif defined(__WXSTUBS__)
#include "wx/stubs/notebook.h"
#endif

Some files were not shown because too many files have changed in this diff Show More