src/make_cw.mcp
+src/common/cwy_tab.c
+src/common/cwlex_yy.c
include/wx_cw.pch
include/wx_cw.pch++
include/wx_cw_d.pch
event applies to wxFrame and wxDialog classes.}
\twocolitem{{\bf EVT\_QUERY\_END\_SESSION(func)}}{Process a query end session event, supplying the member function.
This event applies to wxApp only.}
-\twocolitem{{\bf EVT\__END\_SESSION(func)}}{Process an end session event, supplying the member function.
+\twocolitem{{\bf EVT\_END\_SESSION(func)}}{Process an end session event, supplying the member function.
This event applies to wxApp only.}
\end{twocollist}%
\wxheading{Required headers}
-#include <wx/mimetype.h>
+<wx/mimetype.h>
\wxheading{Derived from}
\begin{verbatim}
// provide the message parameters for the MIME type manager
-class MailMessageParamaters : public wxFileType::MessageParameters
+class MailMessageParameters : public wxFileType::MessageParameters
{
public:
- MailMessageParamaters(const wxString& filename,
+ MailMessageParameters(const wxString& filename,
const wxString& mimetype)
: wxFileType::MessageParameters(filename, mimetype)
{
\end{verbatim}
Now you only need to create an object of this class and pass it to, for example,
-\helpref{GetOpenCommand}{wxfiletypegetopencommand} like this:
+\rtfsp\helpref{GetOpenCommand}{wxfiletypegetopencommand} like this:
\begin{verbatim}
wxString command;
{
// we don't know how to handle such files...
}
-
\end{verbatim}
{\bf Windows:} As only the file name is used by the program associated with the
ever derive from MessageParameters class for a Windows-only program.
\membersection{wxFileType::wxFileType}\label{wxfiletypewxfiletype}
+
\func{}{wxFileType}{\void}
The default constructor is private because you should never create objects of
-this type: they are only returned by
-\helpref{wxMimeTypesManager}{wxmimetypesmanager} methods.
+this type: they are only returned by \helpref{wxMimeTypesManager}{wxmimetypesmanager} methods.
\membersection{wxFileType::\destruct{wxFileType}}\label{wxfiletypedtor}
-\func{}{\destruct{wxFileType}{\void}
+
+\func{}{\destruct{wxFileType}}{\void}
The destructor of this class is not virtual, so it should not be derived from.
\membersection{wxFileType::GetMimeType}\label{wxfiletypegetmimetype}
-\func{bool}{GetMimeType}{\param{wxString *}{mimeType}}
+
+\func{bool}{GetMimeType}{\param{wxString*}{ mimeType}}
If the function returns TRUE, the string pointed to by {\it mimeType} is filled
with full MIME type specification for this file type: for example, "text/plain".
\membersection{wxFileType::GetExtensions}\label{wxfiletypegetextensions}
-\func{bool}{GetExtensions}{\param{wxArrayString \&}{extensions}}
+
+\func{bool}{GetExtensions}{\param{wxArrayString\&}{ extensions}}
If the function returns TRUE, the array {\it extensions} is filled
with all extensions associated with this file type: for example, it may
function in the first place.
\membersection{wxFileType::GetIcon}\label{wxfiletypegeticon}
-\func{bool}{GetIcon}{\param{wxIcon *}{icon}}
+
+\func{bool}{GetIcon}{\param{wxIcon*}{ icon}}
If the function returns TRUE, the icon associated with this file type will be
created and assigned to the {\it icon} parameter.
{\bf Unix:} This function always returns FALSE under Unix.
\membersection{wxFileType::GetDescription}\label{wxfiletypegetdescription}
-\func{bool}{GetDescription}{\param{wxString *}{desc}}
+
+\func{bool}{GetDescription}{\param{wxString*}{ desc}}
If the function returns TRUE, the string pointed to by {\it desc} is filled
with a brief description for this file type: for example, "text document" for
the "text/plain" MIME type.
\membersection{wxFileType::GetOpenCommand}\label{wxfiletypegetopencommand}
-\func{bool}{GetOpenCommand}{\param{wxString *}{command},\param{MessageParameters \&}{params}}
+
+\func{bool}{GetOpenCommand}{\param{wxString*}{ command}, \param{MessageParameters\&}{ params}}
If the function returns TRUE, the string pointed to by {\it command} is filled
with the command which must be executed (see \helpref{wxExecute}{wxexecute}) in
retrieved from \helpref{MessageParameters}{wxfiletypemessageparameters} class.
\membersection{wxFileType::GetPrintCommand}\label{wxfiletypegetprintcommand}
-\func{bool}{GetPrintCommand}{\param{wxString *}{command},\param{MessageParameters \&}{params}}
+
+\func{bool}{GetPrintCommand}{\param{wxString*}{ command},\param{MessageParameters\&}{ params}}
If the function returns TRUE, the string pointed to by {\it command} is filled
with the command which must be executed (see \helpref{wxExecute}{wxexecute}) in
retrieved from \helpref{MessageParameters}{wxfiletypemessageparameters} class.
\membersection{wxFileType::ExpandCommand}\label{wxfiletypeexpandcommand}
-\func{static wxString}{ExpandCommand}{\param{const wxString \&}{command},\param{MessageParameters \&}{params}}
+
+\func{static wxString}{ExpandCommand}{\param{const wxString\&}{ command}, \param{MessageParameters\&}{ params}}
This function is primarly intended for GetOpenCommand and GetPrintCommand
usage but may be also used by the application directly if, for example, you want
to use some non default command to open the file.
The function replaces all occurences of
+
\twocolwidtha{7cm}
\begin{twocollist}\itemsep=0pt
\twocolitem{format specificator}{with}
\twocolitem{\%t}{the MIME type}
\twocolitem{\%\{param\}}{the value of the parameter {\it param}}
\end{twocollist}
+
using the MessageParameters object you pass to it.
If there is no '\%s' in the command string (and the string is not empty), it is
Unlike all other functions of this class, there is no error return for this
function.
+
There are currently the following help controller classes defined:
-\begin{itemize}\itemsep=0
+\begin{itemize}\itemsep=0pt
\item wxWinHelpController, for controlling Windows Help.
\item wxExtHelpController, for controlling external browsers under Unix.
The default browser is Netscape Navigator.
\section{\class{wxImageHandler}}\label{wximagehandler}
-\overview{Overview}{wximageoverview}
-
This is the base class for implementing image file loading/saving, and image creation from data.
It is used within wxImage and is not normally seen by the application.
\wxheading{See also}
-\helpref{wxMenuBar}{wxmenubar}, \helpref{wxMenu}{wxmenu}, \helpref{wxOwnerDrawn}{wxownerdrawn}
+\helpref{wxMenuBar}{wxmenubar}, \helpref{wxMenu}{wxmenu}
\latexignore{\rtfignore{\wxheading{Members}}}
\wxheading{Required headers}
-#include <wx/mimetype.h>
+<wx/mimetype.h>
\wxheading{Derived from}
\membersection{Query database}
-These functions are the heart of this class: they allow to find a
-\helpref{file type}{wxfiletype} object from either file extension or MIME type.
+These functions are the heart of this class: they allow to find a \helpref{file type}{wxfiletype} object
+from either file extension or MIME type.
If the function is successful, it returns a pointer to the wxFileType object
-which {\bf must be deleted by the caller}, otherwise NULL will be returned.
+which {\bf must} be deleted by the caller, otherwise NULL will be returned.
\helpref{GetFileTypeFromMimeType}{wxmimetypesmanagergetfiletypefrommimetype}\\
\helpref{GetFileTypeFromExtension}{wxmimetypesmanagergetfiletypefromextension}
-\membersection{Initialization functions}
+\membersection{Initialization functions}\label{wxmimetypesmanagerinit}
-{\bf Unix:} These functions may be used to load additional (except for the
-default ones which are loaded automatically) files containing MIME
+{\bf Unix:} These functions may be used to load additional files (except for the
+default ones which are loaded automatically) containing MIME
information in either mailcap(5) or mime.types(5) format.
\helpref{ReadMailcap}{wxmimetypesmanagerreadmailcap}\\
}}
\membersection{wxMimeTypesManager::wxMimeTypesManager}\label{wxmimetypesmanagerctor}
+
\func{}{wxMimeTypesManager}{\void}
Constructor puts the object in the "working" state, no additional initialization
additional mailcap/mime.types files.
\membersection{wxMimeTypesManager::\destruct{wxMimeTypesManager}}\label{wxmimetypesmanagerdtor}
-\func{}{\destruct{wxMimeTypesManager}{\void}
+
+\func{}{\destruct{wxMimeTypesManager}}{\void}
Destructor is not virtual, so this class should not be derived from.
\membersection{wxMimeTypesManager::GetFileTypeFromExtension}\label{wxmimetypesmanagergetfiletypefromextension}
-\func{wxFileType *}{GetFileTypeFromExtension}{\param{const wxString \&}{extension}}
+
+\func{wxFileType*}{GetFileTypeFromExtension}{\param{const wxString\&}{ extension}}
Gather information about the files with given extension and return the
corresponding \helpref{wxFileType}{wxfiletype} object or NULL if the extension
is unknown.
\membersection{wxMimeTypesManager::GetFileTypeFromMimeType}\label{wxmimetypesmanagergetfiletypefrommimetype}
-\func{wxFileType *}{GetFileTypeFromMimeType}{\param{const wxString \&}{mimeType}}
+
+\func{wxFileType*}{GetFileTypeFromMimeType}{\param{const wxString\&}{ mimeType}}
Gather information about the files with given MIME type and return the
corresponding \helpref{wxFileType}{wxfiletype} object or NULL if the MIME type
is unknown.
\membersection{wxMimeTypesManager::ReadMailcap}\label{wxmimetypesmanagerreadmailcap}
-\func{\void}{ReadMailcap}{\param{const wxString \&}{filename}}
+
+\func{void}{ReadMailcap}{\param{const wxString\&}{ filename}}
Load additional file containing information about MIME types and associated
information in mailcap format. See metamail(1) and mailcap(5) for more
information.
\membersection{wxMimeTypesManager::ReadMimeTypes}\label{wxmimetypesmanagerreadmimetypes}
-\func{\void}{ReadMimeTypes}{\param{const wxString \&}{filename}}
+
+\func{void}{ReadMimeTypes}{\param{const wxString\&}{ filename}}
Load additional file containing information about MIME types and associated
information in mime.types file format. See metamail(1) and mailcap(5) for more
information.
+
\wxheading{See also}
-\helpref{wxMutex}{wxmutex},
-\helpref{wxCriticalSectionLocker}{wxcriticalsectionlocker}
+\helpref{wxMutex}{wxmutex}, \helpref{wxCriticalSectionLocker}{wxcriticalsectionlocker}
\latexignore{\rtfignore{\wxheading{Members}}}
\membersection{wxMutexLocker::wxMutexLocker}\label{wxmutexlockerctor}
+
\func{}{wxMutexLocker}{\param{wxMutex *}{mutex}}
Constructs a wxMutexLocker object associated with mutex which must be non NULL
-and locks it. Call \helpref{IsOk}{wxmutexisok} to check if the mutex was
+and locks it. Call \helpref{IsLocked}{wxmutexlockerisok} to check if the mutex was
successfully locked.
\membersection{wxMutexLocker::\destruct{wxMutexLocker}}\label{wxmutexlockerdtor}
+
\func{}{\destruct{wxMutexLocker}}{\void}
Destuctor releases the mutex if it was successfully acquired in the ctor.
\membersection{wxMutexLocker::IsOk}\label{wxmutexlockerisok}
+
\constfunc{bool}{IsOk}{\void}
Returns TRUE if mutex was acquired in the constructor, FALSE otherwise.
+
\twocolwidtha{7cm}
\begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf EVT\_NOTEBOOK_PAGE_CHANGED(id, func)}}{The page selection was changed. Processes a
+\twocolitem{{\bf EVT\_NOTEBOOK\_PAGE\_CHANGED(id, func)}}{The page selection was changed. Processes a
wxEVT\_COMMAND\_NOTEBOOK\_PAGE\_CHANGED event.}
-\twocolitem{{\bf EVT\_NOTEBOOK_PAGE_CHANGING(id, func)}}{The page selection is about to be changed.
+\twocolitem{{\bf EVT\_NOTEBOOK\_PAGE\_CHANGING(id, func)}}{The page selection is about to be changed.
Processes a wxEVT\_COMMAND\_NOTEBOOK\_PAGE\_CHANGING event.}
\end{twocollist}%
\helpref{wxSashWindow::GetSashVisible}{wxsashwindowgetsashvisible}
- // Set whether there's a border in this position
- inline void SetSashBorder(wxSashEdgePosition edge, bool border) { m_sashes[edge].m_border = border; }
-
\membersection{wxSashWindow::SetSashBorder}\label{wxsashwindowsetsashborder}
\func{void}{SetSashBorder}{\param{wxSashEdgePosition }{edge}, \param{bool}{ hasBorder}}
used and if the format is
supported (i.e. is one of returned by GetFormat()),
then \helpref{OnDrop}{wxdroptargetondrop} is called.
-Otherwise, \helpref{wxDragNone}{stdformat} is returned by DoDragDrop() and
+Otherwise, wxDragNone is returned by DoDragDrop() and
nothing happens.
\item {\bf The end:} After processing the data, DoDragDrop() returns either
HIGH PRIORITY
-------------
-Find/add wxThread sample - Arthur T-D?
-
-Implement wxDC floating point transformations.
-
-Add wxDC::DeviceToLogical -> wxPoint etc (convenience accessors).
-
-Revamp Dialog Editor for new controls and properties (e.g.
-window id).
+Add further controls and properties to Dialog Editor.
Update manual.
- wxApp changes DONE
- wxMenu changes DONE
- wxModule DONE
- wxRegion DONE
- wxFile DONE
wxTempFile
- wxMask DONE
- wxDC:Blit DONE
- wxTaskBarIcon DONE
wxMsgCatalog etc.
- wxLog
- wxConfig DONE
wxRegKey
- wxTabCtrl DONE
- wxNotebook DONE (some more explanation required)
- wxWave DONE
- wxJoystick DONE
wxStatusBar95 and wxFrame status bar functions
wxListBox changes (for ownerdraw functionality)
wxThread DONE (except for topic overview)
- wxHelpController classes DONE (except for Unix ones)
wxString PARTLY DONE
Drag and drop (change API if required, e.g. const).
- wxCheckListBox DONE
- wxAcceleratorTable DONE
wxBaseArray, other arrays
(wxOwnerDrawn)
Document the include file for each class
- Macros, e.g. wxASSERT
Stream classes
+ wxSocket topic overview
Functions
-Write tutorial.
+Makefiles and/or IDE files for other compilers: Symantec C++,
+Salford C++. IDE files for BC++.
-A wxDC function (or two) for drawing 3D edges.
+Check TODO entries in source and manual.
-Makefiles for other compilers. Generic makefiles?
-Rewrite makefiles to maintain simultaneous debug/release
-objects.
+Add centring, right justify styles to wxStaticText.
-More wxSystemSettings (see comment in settings.cpp).
+Extend wxSystemSettings to get symbols for current nationality,
+e.g. ',' instead of '.' for decimal points.
+
+LOW PRIORITY (MEDIUM TERM)
+--------------------------
+
+Convert remaining utilities e.g. wxGraphLayout.
-Convert remaining utilities e.g. (GLCanvas; wxGraphLayout) and samples
+More wxSystemSettings (see comment in settings.cpp).
-Check TODO entries.
+Synchronize drawing functions on all platforms, using Chris's
+code to test them.
Shell function to invoke a document with open, print, whatever...
-Make use of Vadim's gettext implementation throughout wxWin code.
-Document it.
+Write tutorial.
-Retain callback functions; have semi-compatible callback function prototypes
-for all controls, at least in WXWIN_COMPATIBLE mode, but
-retain (Set)Callback for all compilations. This is following a
-panicky response to losing callbacks.
+Add wxDC::DeviceToLogical -> wxPoint etc (convenience accessors).
-Merge dib.cpp, dibutils.cpp (see also some DIB code in bitmap.cpp).
+Generic makefiles? Rewrite makefiles to maintain simultaneous debug/release
+objects.
Add a wxTabCtrl sample.
Add GetIcon, GetBitmap to wxImageList. Perhaps store bitmaps
in image list so we can get them later.
-Add centring, right justify styles to wxStaticText.
-
-Synchronize drawing functions on all platforms, using Chris's
-code to test them.
-
-Extend wxSystemSettings to get symbols for current nationality,
-e.g. ',' instead of '.' for decimal points.
-
-LOW PRIORITY
-------------
+Merge dib.cpp, dibutils.cpp (see also some DIB code in bitmap.cpp).
Debug PNG support in wxBitmap (no 4-bit support), and possibly add a convertor from PNG
to HICON. We could perhaps also support inclusion of PNGs into
Angled text.
-Eliminate Set/GetDefaultBackgroundColour? Just take background
-colour for child control instead.
-
Think about reimplementing wxBitmapButton, wxStaticBitmap using
BS_BITMAP, SS_BITMAP - but this may not allow wxBitmap
argument, so instead just allow controls loaded from native
resource to deal with this style and call default processing.
-Better clipboard support.
+Better clipboard support (as per Robert's class).
wxWizard class?
Doc/view - have some standard views/docs e.g. wxTextView.
-wxClassWizard for generating files, chunks of code.
-
Miscellaneous file/system function wrappers.
-wxImage or replacement; further wxBitmap/wxIcon etc. functions
-(load animated icos).
-
-Integrate existing multimedia classes.
-
-Rich text class?
-
-Look at WinCE stuff incl. database classes.
-
-Improve conversion guide, compatibility classes, tools?
-
Bug database.
-ActiveX support?
-
-OpenGL integration.
+OpenGL integration: check that wxGLCanvas works cross-platform.
Menu bitmaps - document Vadim's enhancements.
-Enhance Tex2RTF to generate Microsoft HTML help, perhaps Netscape
-HTML help also.
-
wxCreateDynamicObject is apparently slow: ~ 2000 calls to strcmp. Need to
use some kind of hash table scheme.
Write translator between old and new .wxr formats (including
substituting static text for obsolete labels).
-Improve and expand wxSizer classes.
-
Write more validators. Also, how do they work if loading the
dialog from a .wxr? Could call SetValidator from within
InitDialog for all controls, then call TransferDataToWindow.
Add support for more static controls e.g. wxStaticLine.
+Perhaps rewrite wxFile to use FILE* descriptors, so Eof and Flush
+can work.
+
+Find out how to set wxFileDialog position.
+
+Maybe bundle Andrew Tucker's DBWIN32 with wxWindows (it's only
+26KB), for viewing debug messages without a debugger.
+
+Implement wxDC floating point transformations.
+
+A wxDC function (or two) for drawing 3D edges?
+
+LOW PRIORITY (LONG TERM)
+------------------------
+
+Improve and expand wxSizer classes.
+
+ActiveX support
+
+Look at porting to WinCE
+
+Enhance Tex2RTF to generate Microsoft HTML help, perhaps Netscape
+HTML help also.
+
GDI objects could be optimised further in constructors by
searching for a matching, pre-existing object, and assigning from
that, thus sharing the internal handle. A problem with this
(creating a new object rather than searching may or may not be
more efficient).
-Perhaps rewrite wxFile to use FILE* descriptors, so Eof and Flush
-can work.
+Integrate Guilhem's multimedia classes: documentation, makefiles,
+different platforms.
+
+Rich text class.
-Find out how to set wxFileSelector position.
-Maybe bundle Andrew Tucker's DBWIN32 with wxWindows (it's only
-26KB), for viewing debug messages without a debugger.
#if (__MWERKS__ < 0x1000) || !__option(bool)
typedef unsigned int bool;
#endif
+#elif defined(__SC__)
+ typedef unsigned int bool;
#elif defined(_MSC_VER) && (_MSC_VER <= 1000)
typedef unsigned int bool;
#elif defined(_MSC_VER) && (_MSC_VER == 1020)
typedef unsigned char bool;
#endif
-#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__))
+#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__)) || defined(__SC__)
#define byte unsigned char
#endif
typedef long off_t;
#endif
+#if defined(__SC__)
+typedef long off_t;
+#endif
+
const off_t wxInvalidOffset = (off_t)-1;
typedef enum {
// wxNodeBase class is a (base for) node in a double linked list
// -----------------------------------------------------------------------------
+WXDLLEXPORT_DATA(extern wxListKey) wxDefaultListKey;
+
class WXDLLEXPORT wxNodeBase
{
friend class wxListBase;
wxNodeBase *previous = (wxNodeBase *)NULL,
wxNodeBase *next = (wxNodeBase *)NULL,
void *data = NULL,
- const wxListKey& key = wxListKey());
+ const wxListKey& key = wxDefaultListKey);
virtual ~wxNodeBase();
// create a node for the list of this type
virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next,
void *data,
- const wxListKey& key = wxListKey()) = 0;
+ const wxListKey& key = wxDefaultListKey) = 0;
// ctors
// from an array
nodetype *previous = (nodetype *)NULL, \
nodetype *next = (nodetype *)NULL, \
T *data = (T *)NULL, \
- const wxListKey& key = wxListKey()) \
+ const wxListKey& key = wxDefaultListKey) \
: wxNodeBase(list, previous, next, data, key) { } \
\
nodetype *GetNext() const \
protected: \
wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next, \
void *data, \
- const wxListKey& key = wxListKey()) \
+ const wxListKey& key = wxDefaultListKey) \
{ \
return new nodetype(this, \
(nodetype *)prev, (nodetype *)next, \
#endif
#include "wx/defs.h"
+#include "wx/string.h"
/*
The macro which will be expanded to include the file and line number
# endif
#endif
-#include "wx/string.h"
-
#ifdef __WXDEBUG__
void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE);
#endif
#endif
+ // wxUSE_GLOBAL_MEMORY_OPERATORS
#endif
+ // __WXDEBUG__
typedef unsigned int wxMarkerType;
#include "wx/icon.h"
#include "wx/font.h"
#include "wx/gdicmn.h"
+#include "wx/window.h"
class WXDLLEXPORT wxDC: public wxObject
{
#include "wx/dialog.h"
+WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
+
class WXDLLEXPORT wxDirDialog: public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxDirDialog)
#endif
#include "wx/gdiobj.h"
+#include "wx/bitmap.h"
typedef WXDWORD wxDash ;
#define WS_EX_CLIENTEDGE 0
#endif
+#if defined(__WIN32__) && !defined(WS_EX_CLIENTEDGE)
+ #define WS_EX_CLIENTEDGE 0x00000200L
+#endif
+
#if defined(__WIN95__) && defined(__WXDEBUG__) && wxUSE_DBWIN32
#ifdef OutputDebugString
#undef OutputDebugString
#include "wx/list.h"
#include "wx/gdiobj.h"
+#include "wx/gdicmn.h"
class WXDLLEXPORT wxRect;
class WXDLLEXPORT wxPoint;
m_bmpUnchecked = bmpUnchecked;
m_bOwnerDrawn = TRUE; }
- inline wxBitmap& GetBitmap(bool bChecked = TRUE) const
- { return (wxBitmap &)(bChecked ? m_bmpChecked : m_bmpUnchecked); }
+ inline const wxBitmap& GetBitmap(bool bChecked = TRUE) const
+ { return (bChecked ? m_bmpChecked : m_bmpUnchecked); }
// the height of the menu checkmark (or bitmap) is determined by the font
// for the current item, but the width should be always the same (for the
public:
wxPropertyFormFrame(wxPropertyFormView *v, wxFrame *parent, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- long style = wxDEFAULT_FRAME, const wxString& name = "frame"):
+ long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"):
wxFrame(parent, -1, title, pos, size, style, name)
{
m_view = v;
#define wxPROP_PULLDOWN 64
#define wxPROP_SHOWVALUES 128
-#ifdef __XVIEW__
+// Show OK/Cancel buttons on X-based systems where window management is
+// more awkward
+#if defined(__WXMOTIF__) || defined(__WXGTK__)
#define wxPROP_BUTTON_DEFAULT wxPROP_BUTTON_OK | wxPROP_BUTTON_CANCEL | wxPROP_BUTTON_CHECK_CROSS | wxPROP_PULLDOWN
#else
#define wxPROP_BUTTON_DEFAULT wxPROP_BUTTON_CHECK_CROSS | wxPROP_PULLDOWN | wxPROP_SHOWVALUES
public:
wxPropertyListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- long style = wxDEFAULT_FRAME, const wxString& name = "frame"):
+ long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"):
wxFrame(parent, -1, title, pos, size, style, name)
{
m_view = v;
{
#if defined(_MSC_VER)
return _stricmp(psz1, psz2);
+#elif defined(__SC__)
+ return _stricmp(psz1, psz2);
#elif defined(__BORLANDC__)
return stricmp(psz1, psz2);
#elif defined(__WATCOMC__)
RegisterValidators();
// Create the main frame window
- m_mainFrame = new MyFrame(NULL, "wxPropertySheet Demo", wxPoint(0, 0), wxSize(300, 400), wxDEFAULT_FRAME);
+ m_mainFrame = new MyFrame(NULL, "wxPropertySheet Demo", wxPoint(0, 0), wxSize(300, 400), wxDEFAULT_FRAME_STYLE);
// Make a menubar
wxMenu *file_menu = new wxMenu;
public:
PropListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
- long style = wxDEFAULT_FRAME, const wxString& name = "frame"):
+ long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"):
wxPropertyListFrame(v, parent, title, pos, size, style, name)
{
}
#include <commdlg.h>
#endif
-#if defined(__WATCOMC__)
+#if defined(__WATCOMC__) || defined(__SC__)
+#include <windowsx.h>
#include <commdlg.h>
#endif
#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
#include <wx/confbase.h>
#ifdef wxUSE_CONFIG
#pragma hdrstop
#endif //__BORLANDC__
-#ifndef WX_PRECOMP
- #include <wx/string.h>
- #include <wx/intl.h>
-#endif //WX_PRECOMP
-
#include <wx/app.h>
#include <wx/file.h>
#include <wx/log.h>
int n = 0;
for (i = 0; i < noTemplates; i++)
{
- if (templates[i]->IsVisible() && templates[i]->GetViewName())
+ if (templates[i]->IsVisible() && (templates[i]->GetViewName() != ""))
{
strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName;
data[n] = (char *)templates[i];
// we've undone to the start of the list, but can redo the first.
wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
wxString redoCommandName(redoCommand->GetName());
- if (!redoCommandName) redoCommandName = _("Unnamed command");
+ if (redoCommandName == "") redoCommandName = _("Unnamed command");
buf = wxString(_("&Redo ")) + redoCommandName;
m_commandEditMenu->SetLabel(wxID_REDO, buf);
m_commandEditMenu->Enable(wxID_REDO, TRUE);
// BC++ doesn't like while (table.entries[i].m_fn)
+#ifdef __SC__
+ while (table.entries[i].m_fn != 0)
+#else
while (table.entries[i].m_fn != 0L)
+#endif
{
if ((event.GetEventType() == table.entries[i].m_eventType) &&
(table.entries[i].m_id == -1 || // Match, if event spec says any id will do (id == -1)
#endif //__BORLANDC__
#ifndef WX_PRECOMP
- #include "wx/string.h"
- #include "wx/intl.h"
+ #include "wx/wx.h"
#endif //WX_PRECOMP
#include "wx/app.h"
#else
struct stat stbuf;
- if (filename && stat ((char *)(const char *)filename, &stbuf) == 0)
+ if ((filename != "") && stat ((char *)(const char *)filename, &stbuf) == 0)
return TRUE;
return FALSE;
#endif
strncmp(dest, val, len) == 0)
{
strcpy(wxBuffer, "~");
- if (user && *user)
- strcat(wxBuffer, user);
+ if (user != "")
+ strcat(wxBuffer, (const char*) user);
#ifdef __WXMSW__
// strcat(wxBuffer, "\\");
#else
#pragma hdrstop
#endif
-
+#include "wx/event.h"
#include "wx/gdicmn.h"
#include "wx/brush.h"
#include "wx/pen.h"
// each_font->GetFontId () == FamilyOrFontId) /* New font system */
//#else
each_font->GetFamily () == FamilyOrFontId &&
- (!each_font->GetFaceName() || each_font->GetFaceName() == Face))
+ ((each_font->GetFaceName() == "") || each_font->GetFaceName() == Face))
//#endif
return each_font;
}
#endif
#include "wx/filefn.h"
+#ifdef __WXMSW__
+#include <windows.h>
+#endif
+
//-----------------------------------------------------------------------------
// wxImage
//-----------------------------------------------------------------------------
// wxWindows
#ifndef WX_PRECOMP
+ #include <wx/event.h>
#include <wx/app.h>
#include <wx/string.h>
#include <wx/intl.h>
#include <wx/menu.h>
#include <wx/frame.h>
-
- #include <wx/generic/msgdlgg.h>
+ #include <wx/msgdlg.h>
#include <wx/filedlg.h>
#include <wx/textctrl.h>
#endif //WX_PRECOMP
// wxWindows
#ifndef WX_PRECOMP
#include "wx/string.h"
+ #include "wx/icon.h"
#endif //WX_PRECOMP
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/dynarray.h"
+#include "wx/confbase.h"
#ifdef __WXMSW__
#include "wx/msw/registry.h"
+ #include "windows.h"
#else // Unix
#include "wx/textfile.h"
#endif // OS
int wxPreviewControlBar::GetZoomControl()
{
char buf[20];
- if (m_zoomControl && m_zoomControl->GetStringSelection())
+ if (m_zoomControl && (m_zoomControl->GetStringSelection() != ""))
{
strcpy(buf, m_zoomControl->GetStringSelection());
buf[strlen(buf) - 1] = 0;
#include "wx/button.h"
#include "wx/bmpbuttn.h"
#include "wx/radiobox.h"
+#include "wx/radiobut.h"
#include "wx/listbox.h"
#include "wx/choice.h"
#include "wx/checkbox.h"
#include "wx/settings.h"
#include "wx/slider.h"
#include "wx/statbox.h"
+#include "wx/statbmp.h"
#if wxUSE_GAUGE
#include "wx/gauge.h"
#endif
wxExpr *coloursExpr = listExpr->Nth(3);
wxExpr *xresExpr = listExpr->Nth(4);
wxExpr *yresExpr = listExpr->Nth(5);
- if (nameExpr && nameExpr->StringValue())
+ if (nameExpr && nameExpr->StringValue() != "")
{
bitmapSpec->SetName(nameExpr->StringValue());
}
- if (typeExpr && typeExpr->StringValue())
+ if (typeExpr && typeExpr->StringValue() != "")
{
bitmapSpec->SetValue1(wxParseWindowStyle(typeExpr->StringValue()));
}
else
bitmapSpec->SetValue1(0);
- if (platformExpr && platformExpr->StringValue())
+ if (platformExpr && platformExpr->StringValue() != "")
{
wxString plat(platformExpr->StringValue());
if (plat == "windows" || plat == "WINDOWS")
wxItemResource *item = table->FindResource(resource);
if (item)
{
- if (!item->GetType() || strcmp(item->GetType(), "wxBitmap") != 0)
+ if ((item->GetType() == "") || (item->GetType() != "wxBitmap"))
{
wxLogWarning(_("%s not a bitmap resource specification."), (const char*) resource);
return wxNullBitmap;
wxItemResource *resource = table->FindResource((const char *)resourceName);
// if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
- if (!resource || !resource->GetType() ||
- ! ((strcmp(resource->GetType(), "wxDialog") == 0) || (strcmp(resource->GetType(), "wxPanel") == 0)))
+ if (!resource || (resource->GetType() == "") ||
+ ! ((resource->GetType() == "wxDialog") || (resource->GetType() == "wxPanel")))
return FALSE;
wxString title(resource->GetTitle());
// always available), but it's unsafe because it doesn't check for buffer
// size - so give a warning
#define wxVsprintf(buffer,len,format,argptr) vsprintf(buffer,format, argptr)
+#ifndef __SC__
#pragma message("Using sprintf() because no snprintf()-like function defined")
#endif
+#endif
// ----------------------------------------------------------------------------
// global functions
#endif
#ifndef WX_PRECOMP
+#include "wx/object.h"
+#include "wx/font.h"
+#include "wx/colour.h"
#include "wx/settings.h"
#endif
void wxPropertyStringListEditorDialog::OnText(wxCommandEvent& event)
{
- if (event.GetEventType() == wxEVENT_TYPE_TEXT_ENTER_COMMAND)
+ if (event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER)
{
SaveCurrentSelection();
}
WXDIR = $(WXWIN)
INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
+LIBDIR = $(WXDIR)\lib
SRCSUFF = cpp
OBJSUFF = obj
+INCLUDE=$(INCDIR)
+
# default values
CC=sc
RC=rc
-CFLAGS = -o -ml -W -D__WXMSW__
-LDFLAGS = -ml -W
+
+CFLAGS = -o -mn -W -D__NT__ -DWIN32 -D__WIN32__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
+LDFLAGS = $(EXTRALDFLAGS)
.$(SRCSUFF).obj:
- *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $<
+ *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $< -o$@
+
+# -Jm: relaxed type checking
+.c.obj:
+ *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) -DUSE_DEFINE -Jm $< -o$@
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/setup.h"
+#include "wx/window.h"
#endif
#include "wx/msw/private.h"
// if you don't do the same for the Ole calls further down.
// Also, OLE is used not just for drag and drop (it's used by automatn.cpp).
// #if wxUSE_DRAG_AND_DROP
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SC__)
#include <ole2.h>
#endif
// #endif
}
*/
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SC__)
// we need to initialize OLE library
if ( FAILED(::OleInitialize(NULL)) )
wxFatalError(_("Cannot initialize OLE"));
if ( wxDisableButtonBrush )
::DeleteObject( wxDisableButtonBrush ) ;
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SC__)
::OleUninitialize();
#endif
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/palette.h"
+#include "wx/dcmemory.h"
#include "wx/bitmap.h"
#include "wx/icon.h"
#endif
#ifndef WX_PRECOMP
#include "wx/button.h"
+#include "wx/brush.h"
#endif
#include "wx/msw/private.h"
#ifndef WX_PRECOMP
#include "wx/checkbox.h"
+#include "wx/brush.h"
#endif
#include "wx/msw/private.h"
SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0);
}
+#ifndef BST_CHECKED
+#define BST_CHECKED 0x0001
+#endif
+
bool wxCheckBox::GetValue(void) const
{
#ifdef __WIN32__
#include <windows.h>
+#include "wx/object.h"
+#include "wx/colour.h"
+#include "wx/font.h"
+#include "wx/bitmap.h"
+#include "wx/window.h"
+#include "wx/listbox.h"
#include "wx/ownerdrw.h"
+#include "wx/settings.h"
+#include "wx/dcmemory.h"
#include "wx/msw/checklst.h"
// ============================================================================
RECT rect = { 0, 0, nCheckWidth, nCheckHeight };
#ifdef __WIN32__
+#ifndef __SC__
DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
+#endif
#else
// In WIN16, draw a cross
HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
#ifndef WX_PRECOMP
#include "wx/choice.h"
+#include "wx/utils.h"
#endif
#include "wx/msw/private.h"
#if wxUSE_CLIPBOARD
#ifndef WX_PRECOMP
+#include "wx/object.h"
+#include "wx/event.h"
#include "wx/app.h"
#include "wx/frame.h"
#include "wx/bitmap.h"
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/defs.h"
+#include "wx/bitmap.h"
#include "wx/pen.h"
#include "wx/brush.h"
+#include "wx/colour.h"
#include "wx/gdicmn.h"
#include "wx/utils.h"
#include "wx/frame.h"
#endif
#ifndef WX_PRECOMP
+#include "wx/event.h"
#include "wx/app.h"
#include "wx/dcclient.h"
#endif
+#include "wx/control.h"
+
#include "wx/msw/private.h"
#if defined(__WIN95__) && !defined(__GNUWIN32__)
wxWindow *parent = (wxWindow *)GetParent();
if (parent)
{
- if (parent->GetDefaultItem() == this)
+ if (parent->GetDefaultItem() == (wxButton*) this)
parent->SetDefaultItem(NULL);
}
}
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/app.h"
+#include "wx/bitmap.h"
+#include "wx/dcmemory.h"
#endif
#include "wx/dcprint.h"
void wxDC::DrawIcon(const wxIcon& icon, long x, long y)
{
-#if defined(__WIN32__)
+#if defined(__WIN32__) && !defined(__SC__)
::DrawIconEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON(),
icon.GetWidth(), icon.GetHeight(), 0, 0, DI_NORMAL);
#else
#endif
#ifndef WX_PRECOMP
+#include "wx/utils.h"
#endif
#include "wx/dcmemory.h"
#ifndef WX_PRECOMP
#include "wx/setup.h"
#include "wx/defs.h"
+#include "wx/bitmap.h"
#endif
#include <windows.h>
return((HPALETTE) GetStockObject(DEFAULT_PALETTE));
}
-bool wxLoadIntoBitmap(char *filename, wxBitmap *bitmap, wxColourMap **pal)
+bool wxLoadIntoBitmap(char *filename, wxBitmap *bitmap, wxPalette **pal)
{
HBITMAP hBitmap;
HPALETTE hPalette;
{
if (pal)
{
- *pal = new wxColourMap;
+ *pal = new wxPalette;
(*pal)->SetHPALETTE((WXHPALETTE) hPalette);
}
else
else return FALSE;
}
-wxBitmap *wxLoadBitmap(char *filename, wxColourMap **pal)
+wxBitmap *wxLoadBitmap(char *filename, wxPalette **pal)
{
wxBitmap *bitmap = new wxBitmap;
if (wxLoadIntoBitmap(filename, bitmap, pal))
return hDIB;
}
-bool wxSaveBitmap(char *filename, wxBitmap *bitmap, wxColourMap *colourmap)
+bool wxSaveBitmap(char *filename, wxBitmap *bitmap, wxPalette *colourmap)
{
HPALETTE hPalette = 0;
if (colourmap)
bmf.bfReserved1 = 0;
bmf.bfReserved2 = 0;
bmf.bfOffBits = sizeof(bmf) + (char far*)(DibPtr(lpbi)) - (char far*)lpbi;
-#if defined( __WATCOMC__) || defined(_MSC_VER)
+#if defined( __WATCOMC__) || defined(_MSC_VER) || defined(__SC__)
if (_hwrite(fh, (LPCSTR)(&bmf), sizeof(bmf))<0 ||
_hwrite(fh, (LPCSTR)lpbi, size)<0) {
_lclose(fh);
#include <stdio.h>
#include "wx/defs.h"
#include "wx/utils.h"
+#include "wx/msgdlg.h"
#include "wx/dialog.h"
#include "wx/filedlg.h"
+#include "wx/intl.h"
#endif
#include <windows.h>
WXDWORD extendedStyle = MakeExtendedStyle(style);
-#ifndef __WIN16__
+#if !defined(__WIN16__) && !defined(__SC__)
if (style & wxFRAME_TOOL_WINDOW)
extendedStyle |= WS_EX_TOOLWINDOW;
#endif
#ifndef WX_PRECOMP
#include "wx/defs.h"
+#include "wx/utils.h"
#endif
#if wxUSE_GAUGE
bool wxWinHelpController::DisplayBlock(long block)
{
// Use context number -- a very rough equivalent to block id!
- if (!m_helpFile) return FALSE;
+ if (m_helpFile == "") return FALSE;
char buf[_MAXPATHLEN];
strcpy(buf, m_helpFile);
{
if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
{
-#if defined(__WIN32__)
+#if defined(__WIN32__) && !defined(__SC__)
if (desiredWidth > -1 && desiredHeight > -1)
{
M_ICONHANDLERDATA->m_hIcon = (WXHICON) ::LoadImage(wxGetInstance(), name, IMAGE_ICON, desiredWidth, desiredHeight, LR_DEFAULTCOLOR);
#ifndef WX_PRECOMP
#include <wx/string.h>
#include <wx/intl.h>
+ #include <wx/event.h>
#include <wx/app.h>
+ #include <wx/utils.h>
#endif //WX_PRECOMP
#include <wx/dynarray.h>
bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso)
{
// passing NULL as value to WritePrivateProfileString deletes the key
- if ( !Write(szKey, (const char *)NULL) )
+// if ( !Write(szKey, (const char *)NULL) )
+// return FALSE;
+ wxConfigPathChanger path(this, szKey);
+ wxString strKey = GetPrivateKeyName(path.Name());
+
+ if (WritePrivateProfileString(m_strGroup, szKey,
+ (const char*) NULL, m_strLocalFilename) == 0)
return FALSE;
-
+
if ( !bGroupIfEmptyAlso || !IsEmpty() )
return TRUE;
#ifndef WX_PRECOMP
#include "wx/listbox.h"
#include "wx/settings.h"
+#include "wx/brush.h"
+#include "wx/font.h"
+#include "wx/dc.h"
#endif
#include "wx/msw/private.h"
#pragma hdrstop
#endif
+#include "wx/event.h"
#include "wx/app.h"
#include <windows.h>
$(MSWDIR)\log.obj \
$(MSWDIR)\layout.obj \
$(MSWDIR)\memory.obj \
+ $(MSWDIR)\mimetype.obj \
$(MSWDIR)\module.obj \
$(MSWDIR)\object.obj \
$(MSWDIR)\postscrp.obj \
$(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
+$(MSWDIR)\mimetype.obj: $(COMMDIR)\mimetype.$(SRCSUFF)
+
$(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
$(MSWDIR)\dynlib.obj \
$(MSWDIR)\tokenzr.obj
+# Don't compile for WIN16
# $(MSWDIR)\socket.obj \
# $(MSWDIR)\sckaddr.obj \
# $(MSWDIR)\protocol.obj \
# $(MSWDIR)\ftp.obj \
# $(MSWDIR)\sckfile.obj \
# $(MSWDIR)\sckipc.obj \
+
+# Needs extra files (sql*.h) so not compiled by default.
# $(MSWDIR)\odbc.obj \
+# Uses WIN32 registry functions
+# $(MSWDIR)\mimetype.obj \
+
MSWOBJS = \
$(MSWDIR)\accel.obj \
$(MSWDIR)\app.obj \
$(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
+$(MSWDIR)\mimetype.obj: $(COMMDIR)\mimetype.$(SRCSUFF)
+
$(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
# Doesn't compile (nested classes)
# $(COMMDIR)\fileconf.obj\
+# Uses WIN32 registry functions
+# $(COMMDIR)\mimetype.obj \
+
# Fails when including png.h, on jmp_buf.
# $(COMMDIR)\image.obj \
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
+$(COMMDIR)/mimetype.obj: $*.$(SRCSUFF)
+ cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
$(COMMDIR)/module.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
$(COMMDIR)/log.$(OBJSUFF) \
$(COMMDIR)/memory.$(OBJSUFF) \
$(COMMDIR)/module.$(OBJSUFF) \
+ $(COMMDIR)/mimetype.$(OBJSUFF) \
$(COMMDIR)/object.$(OBJSUFF) \
$(COMMDIR)/odbc.$(OBJSUFF) \
$(COMMDIR)/process.$(OBJSUFF) \
$(COMMDIR)\layout.obj \
$(COMMDIR)\log.obj \
$(COMMDIR)\memory.obj \
+ $(COMMDIR)\mimetype.obj \
$(COMMDIR)\module.obj \
$(COMMDIR)\odbc.obj \
$(COMMDIR)\object.obj \
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
<<
+$(COMMDIR)/mimetype.obj: $*.$(SRCSUFF)
+ cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
$(COMMDIR)/module.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makesc.env
+include ..\makesc.env
-INCDIR = $(WXDIR)\include
-MSWINC = $(INCDIR)\msw
-BASEINC = $(INCDIR)\base
+DEBUG=0
-# default values overridden by src\makefile.sc
-
-CC=sc
-CFLAGS = -o -ml -W -Dwx_msw
-
-INCLUDE=$(BASEINC);$(MSWINC);$(WXDIR)\contrib\fafa;$(WXDIR)\contrib\itsybits
+LIBTARGET = $(LIBDIR)\wx.lib
OPTIONS=
# end of configuration section ##########################################
-OBJS = wx_win.obj wx_frame.obj wx_panel.obj wx_utils.obj wx_main.obj \
-wx_item.obj wx_text.obj wx_gdi.obj wx_dialg.obj wx_canvs.obj wx_dc.obj \
-wx_mf.obj wx_ipc.obj wx_timer.obj wx_clipb.obj wx_scrol.obj wx_vlbox.obj \
-wx_stat.obj wx_buttn.obj wx_messg.obj wx_check.obj wx_choic.obj wx_rbox.obj wx_lbox.obj \
-wx_group.obj wx_gauge.obj wx_txt.obj wx_mtxt.obj wx_slidr.obj wx_menu.obj wx_db.obj\
-wx_cmdlg.obj
-
-all: $(OBJS)
-
-wx_obj.obj: $(BASEINC)\wx_obj.h
-
-wx_win.obj: $(BASEINC)\wx_defs.h $(MSWINC)\wx_win.h \
-$(BASEINC)\wx_obj.h $(BASEINC)\wx_utils.h wx_win.$(SRCSUFF) \
-$(MSWINC)\wx_gdi.h $(MSWINC)\wx_privt.h
-
-wx_main.obj: $(BASEINC)\wx_defs.h $(BASEINC)\wx_obj.h \
-$(MSWINC)\wx_frame.h $(BASEINC)\wx_utils.h
-
-wx_frame.obj: $(BASEINC)\wx_defs.h $(MSWINC)\wx_win.h $(BASEINC)\wx_obj.h \
-$(BASEINC)\wx_utils.h $(MSWINC)\wx_frame.h wx_frame.$(SRCSUFF) \
-$(BASEINC)\wx_stdev.h $(MSWINC)\wx_privt.h
-
-wx_panel.obj: $(BASEINC)\wx_defs.h $(MSWINC)\wx_win.h $(BASEINC)\wx_obj.h \
-$(BASEINC)\wx_utils.h $(MSWINC)\wx_frame.h $(MSWINC)\wx_panel.h \
-wx_panel.$(SRCSUFF) $(BASEINC)\wx_stdev.h $(MSWINC)\wx_privt.h
-
-wx_text.obj: $(BASEINC)\wx_defs.h $(MSWINC)\wx_win.h $(BASEINC)\wx_obj.h \
-$(BASEINC)\wx_utils.h $(MSWINC)\wx_frame.h $(MSWINC)\wx_text.h \
-wx_text.$(SRCSUFF) $(BASEINC)\wx_stdev.h $(MSWINC)\wx_privt.h
-
-wx_canvs.obj: $(BASEINC)\wx_defs.h $(MSWINC)\wx_win.h $(BASEINC)\wx_obj.h \
-$(BASEINC)\wx_utils.h $(MSWINC)\wx_frame.h $(MSWINC)\wx_canvs.h \
-wx_canvs.$(SRCSUFF) $(BASEINC)\wx_stdev.h $(MSWINC)\wx_gdi.h $(MSWINC)\wx_dc.h \
-$(MSWINC)\wx_privt.h
-
-wx_dc.obj: $(BASEINC)\wx_defs.h $(MSWINC)\wx_win.h $(BASEINC)\wx_obj.h \
-$(BASEINC)\wx_utils.h $(MSWINC)\wx_frame.h $(MSWINC)\wx_canvs.h wx_dc.$(SRCSUFF) \
-$(BASEINC)\wx_stdev.h $(MSWINC)\wx_gdi.h $(MSWINC)\wx_dc.h \
-$(MSWINC)/wx_dccan.h $(MSWINC)/wx_dcmem.h
-
-wx_mf.obj: $(BASEINC)\wx_defs.h $(MSWINC)\wx_win.h $(BASEINC)\wx_obj.h \
-wx_mf.$(SRCSUFF) $(BASEINC)\wx_stdev.h $(MSWINC)\wx_gdi.h $(MSWINC)\wx_mf.h
-
-wx_item.obj: $(BASEINC)\wx_defs.h $(MSWINC)\wx_win.h $(BASEINC)\wx_obj.h \
-$(BASEINC)\wx_utils.h $(MSWINC)\wx_frame.h $(MSWINC)\wx_item.h \
-wx_item.$(SRCSUFF) $(BASEINC)\wx_stdev.h $(MSWINC)\wx_privt.h
-
-wx_utils.obj: $(BASEINC)\wx_defs.h $(BASEINC)\wx_obj.h \
-$(BASEINC)\wx_utils.h wx_utils.$(SRCSUFF)
-
-wx_ipc.obj: $(BASEINC)\wx_defs.h $(BASEINC)\wx_obj.h \
-$(BASEINC)\wx_utils.h $(MSWINC)\wx_ipc.h wx_ipc.$(SRCSUFF)
-
-wx_gdi.obj: $(BASEINC)\wx_defs.h $(MSWINC)\wx_gdi.h $(BASEINC)\wx_utils.h \
-wx_gdi.$(SRCSUFF)
-
-wx_dialg.obj: $(BASEINC)\wx_defs.h wx_dialg.$(SRCSUFF) $(MSWINC)\wx_dialg.h \
-$(MSWINC)\wx_win.h $(BASEINC)\wx_utils.h $(MSWINC)\wx_panel.h \
-$(MSWINC)\wx_privt.h
-
-wx_timer.obj: $(BASEINC)\wx_defs.h wx_timer.$(SRCSUFF) $(MSWINC)\wx_timer.h
-
-wx_clipb.obj: $(BASEINC)\wx_defs.h wx_clipb.$(SRCSUFF) $(MSWINC)\wx_clipb.h
+GENDIR=$(WXDIR)\src\generic
+COMMDIR=$(WXDIR)\src\common
+XPMDIR=$(WXDIR)\src\xpm
+OLEDIR=ole
+MSWDIR=$(WXDIR)\src\msw
+
+GENERICOBJS= \
+ $(GENDIR)\choicdgg.obj \
+ $(GENDIR)\gridg.obj \
+ $(GENDIR)\laywin.obj \
+ $(GENDIR)\panelg.obj \
+ $(GENDIR)\prop.obj \
+ $(GENDIR)\propform.obj \
+ $(GENDIR)\proplist.obj \
+ $(GENDIR)\sashwin.obj \
+ $(GENDIR)\scrolwin.obj \
+ $(GENDIR)\splitter.obj \
+ $(GENDIR)\statusbr.obj \
+ $(GENDIR)\tabg.obj \
+ $(GENDIR)\textdlgg.obj
+
+# $(GENDIR)\imaglist.obj \
+# $(GENDIR)\treectrl.obj \
+# $(GENDIR)\listctrl.obj \
+# $(GENDIR)\notebook.obj \
+
+# These are generic things that don't need to be compiled on MSW,
+# but sometimes it's useful to do so for testing purposes.
+NONESSENTIALOBJS= \
+ $(GENDIR)\printps.obj \
+ $(GENDIR)\prntdlgg.obj \
+ $(GENDIR)\msgdlgg.obj \
+ $(GENDIR)\helpxlp.obj \
+ $(GENDIR)\colrdlgg.obj \
+ $(GENDIR)\fontdlgg.obj \
+ $(COMMDIR)\postscrp.obj
+
+COMMONOBJS = \
+ $(COMMDIR)\cmndata.obj \
+ $(COMMDIR)\config.obj \
+ $(COMMDIR)\docview.obj \
+ $(COMMDIR)\docmdi.obj \
+ $(COMMDIR)\dynarray.obj \
+ $(COMMDIR)\dynlib.obj \
+ $(COMMDIR)\event.obj \
+ $(COMMDIR)\file.obj \
+ $(COMMDIR)\filefn.obj \
+ $(COMMDIR)\fileconf.obj \
+ $(COMMDIR)\framecmn.obj \
+ $(COMMDIR)\gdicmn.obj \
+ $(COMMDIR)\image.obj \
+ $(COMMDIR)\intl.obj \
+ $(COMMDIR)\ipcbase.obj \
+ $(COMMDIR)\helpbase.obj \
+ $(COMMDIR)\layout.obj \
+ $(COMMDIR)\log.obj \
+ $(COMMDIR)\memory.obj \
+ $(COMMDIR)\mimetype.obj \
+ $(COMMDIR)\module.obj \
+ $(COMMDIR)\object.obj \
+ $(COMMDIR)\prntbase.obj \
+ $(COMMDIR)\resource.obj \
+ $(COMMDIR)\tbarbase.obj \
+ $(COMMDIR)\tbarsmpl.obj \
+ $(COMMDIR)\textfile.obj \
+ $(COMMDIR)\timercmn.obj \
+ $(COMMDIR)\utilscmn.obj \
+ $(COMMDIR)\validate.obj \
+ $(COMMDIR)\valtext.obj \
+ $(COMMDIR)\date.obj \
+ $(COMMDIR)\hash.obj \
+ $(COMMDIR)\list.obj \
+ $(COMMDIR)\string.obj \
+ $(COMMDIR)\socket.obj \
+ $(COMMDIR)\sckaddr.obj \
+ $(COMMDIR)\sckfile.obj \
+ $(COMMDIR)\sckipc.obj \
+ $(COMMDIR)\sckstrm.obj \
+ $(COMMDIR)\url.obj \
+ $(COMMDIR)\http.obj \
+ $(COMMDIR)\protocol.obj \
+ $(COMMDIR)\time.obj \
+ $(COMMDIR)\tokenzr.obj \
+ $(COMMDIR)\wxexpr.obj \
+ $(COMMDIR)\y_tab.obj \
+ $(COMMDIR)\extended.obj \
+ $(COMMDIR)\process.obj \
+ $(COMMDIR)\wfstream.obj \
+ $(COMMDIR)\mstream.obj \
+ $(COMMDIR)\zstream.obj \
+ $(COMMDIR)\stream.obj \
+ $(COMMDIR)\datstrm.obj \
+ $(COMMDIR)\objstrm.obj \
+ $(COMMDIR)\variant.obj \
+ $(COMMDIR)\wincmn.obj
+
+# Don't compile
+# $(COMMDIR)\db.obj \
+# $(COMMDIR)\dbtable.obj \
+# $(COMMDIR)\odbc.obj \
+
+MSWOBJS = \
+ $(MSWDIR)\accel.obj \
+ $(MSWDIR)\app.obj \
+ $(MSWDIR)\bitmap.obj \
+ $(MSWDIR)\bmpbuttn.obj \
+ $(MSWDIR)\brush.obj \
+ $(MSWDIR)\button.obj \
+ $(MSWDIR)\checkbox.obj \
+ $(MSWDIR)\checklst.obj \
+ $(MSWDIR)\choice.obj \
+ $(MSWDIR)\clipbrd.obj \
+ $(MSWDIR)\colordlg.obj \
+ $(MSWDIR)\colour.obj \
+ $(MSWDIR)\combobox.obj \
+ $(MSWDIR)\control.obj \
+ $(MSWDIR)\curico.obj \
+ $(MSWDIR)\cursor.obj \
+ $(MSWDIR)\data.obj \
+ $(MSWDIR)\dc.obj \
+ $(MSWDIR)\dcmemory.obj \
+ $(MSWDIR)\dcclient.obj \
+ $(MSWDIR)\dcprint.obj \
+ $(MSWDIR)\dcscreen.obj \
+ $(MSWDIR)\dde.obj \
+ $(MSWDIR)\dialog.obj \
+ $(MSWDIR)\dib.obj \
+ $(MSWDIR)\dibutils.obj \
+ $(MSWDIR)\dirdlg.obj \
+ $(MSWDIR)\filedlg.obj \
+ $(MSWDIR)\font.obj \
+ $(MSWDIR)\fontdlg.obj \
+ $(MSWDIR)\frame.obj \
+ $(MSWDIR)\gauge95.obj \
+ $(MSWDIR)\gaugemsw.obj \
+ $(MSWDIR)\gdiobj.obj \
+ $(MSWDIR)\helpwin.obj \
+ $(MSWDIR)\icon.obj \
+ $(MSWDIR)\iniconf.obj \
+ $(MSWDIR)\listbox.obj \
+ $(MSWDIR)\main.obj \
+ $(MSWDIR)\mdi.obj \
+ $(MSWDIR)\menu.obj \
+ $(MSWDIR)\menuitem.obj \
+ $(MSWDIR)\metafile.obj \
+ $(MSWDIR)\minifram.obj \
+ $(MSWDIR)\msgdlg.obj \
+ $(MSWDIR)\nativdlg.obj \
+ $(MSWDIR)\ownerdrw.obj \
+ $(MSWDIR)\palette.obj \
+ $(MSWDIR)\pen.obj \
+ $(MSWDIR)\penwin.obj \
+ $(MSWDIR)\printdlg.obj \
+ $(MSWDIR)\printwin.obj \
+ $(MSWDIR)\radiobox.obj \
+ $(MSWDIR)\radiobut.obj \
+ $(MSWDIR)\region.obj \
+ $(MSWDIR)\registry.obj \
+ $(MSWDIR)\regconf.obj \
+ $(MSWDIR)\scrolbar.obj \
+ $(MSWDIR)\settings.obj \
+ $(MSWDIR)\slidrmsw.obj \
+ $(MSWDIR)\slider95.obj \
+ $(MSWDIR)\spinbutt.obj \
+ $(MSWDIR)\statbmp.obj \
+ $(MSWDIR)\statbox.obj \
+ $(MSWDIR)\statbr95.obj \
+ $(MSWDIR)\stattext.obj \
+ $(MSWDIR)\tabctrl.obj \
+ $(MSWDIR)\taskbar.obj \
+ $(MSWDIR)\tbar95.obj \
+ $(MSWDIR)\tbarmsw.obj \
+ $(MSWDIR)\textctrl.obj \
+ $(MSWDIR)\thread.obj \
+ $(MSWDIR)\timer.obj \
+ $(MSWDIR)\utils.obj \
+ $(MSWDIR)\utilsexc.obj \
+ $(MSWDIR)\wave.obj \
+ $(MSWDIR)\window.obj
+
+# Need Win95 support for these
+# $(MSWDIR)\notebook.obj \
+# $(MSWDIR)\listctrl.obj \
+# $(MSWDIR)\imaglist.obj \
+# $(MSWDIR)\treectrl.obj \
+# $(OLEDIR)\droptgt.obj \
+# $(OLEDIR)\dropsrc.obj \
+# $(OLEDIR)\dataobj.obj \
+# $(OLEDIR)\oleutils.obj \
+# $(OLEDIR)\uuid.obj \
+# $(OLEDIR)\automtn.obj
+
+# Doesn't compile with SC++ 6
+# $(MSWDIR)\joystick.obj \
+# $(MSWDIR)\pnghand.obj \
+
+XPMOBJECTS = $(XPMDIR)\crbuffri.obj\
+ $(XPMDIR)\crdatfri.obj\
+ $(XPMDIR)\create.obj $(XPMDIR)\crifrbuf.obj\
+ $(XPMDIR)\crifrdat.obj\
+ $(XPMDIR)\data.obj\
+ $(XPMDIR)\hashtab.obj $(XPMDIR)\misc.obj\
+ $(XPMDIR)\parse.obj $(XPMDIR)\rdftodat.obj\
+ $(XPMDIR)\rdftoi.obj\
+ $(XPMDIR)\rgb.obj $(XPMDIR)\scan.obj\
+ $(XPMDIR)\simx.obj $(XPMDIR)\wrffrdat.obj\
+ $(XPMDIR)\wrffrp.obj $(XPMDIR)\wrffri.obj
+
+# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) # $(XPMOBJECTS)
+
+all: $(LIBTARGET)
+
+$(LIBTARGET): $(OBJECTS)
+ -del $(LIBTARGET)
+ *lib /PAGESIZE:512 $(LIBTARGET) y $(OBJECTS), nul;
-wx_stat.obj: wx_stat.$(SRCSUFF) $(MSWINC)\wx_stat.h
-
-wx_scrol.obj: wx_scrol.$(SRCSUFF) $(MSWINC)\wx_scrol.h
-
-wx_vlbox.obj: wx_vlbox.$(SRCSUFF) $(MSWINC)\wx_vlbox.h
-
-wx_buttn.obj: wx_buttn.$(SRCSUFF) $(MSWINC)\wx_buttn.h
-
-wx_messg.obj: wx_messg.$(SRCSUFF) $(MSWINC)\wx_messg.h
-
-wx_check.obj: wx_check.$(SRCSUFF) $(MSWINC)\wx_check.h
-
-wx_choic.obj: wx_choic.$(SRCSUFF) $(MSWINC)\wx_choic.h
-
-wx_rbox.obj: wx_rbox.$(SRCSUFF) $(MSWINC)\wx_rbox.h
-
-wx_lbox.obj: wx_lbox.$(SRCSUFF) $(MSWINC)\wx_lbox.h
-
-wx_group.obj: wx_group.$(SRCSUFF) $(MSWINC)\wx_group.h
-
-wx_gauge.obj: wx_gauge.$(SRCSUFF) $(MSWINC)\wx_gauge.h
-
-wx_txt.obj: wx_txt.$(SRCSUFF) $(MSWINC)\wx_txt.h
-
-wx_mtxt.obj: wx_mtxt.$(SRCSUFF) $(MSWINC)\wx_mtxt.h
-
-wx_slidr.obj: wx_slidr.$(SRCSUFF) $(MSWINC)\wx_slidr.h
-
-wx_menu.obj: wx_menu.$(SRCSUFF) $(MSWINC)\wx_menu.h
-
-wx_db.obj: wx_db.$(SRCSUFF) $(MSWINC)\wx_db.h
+clean:
+ -del *.obj
+ -del $(LIBTARGET)
-wx_cmdlg.obj: wx_cmdlg.$(SRCSUFF) $(MSWINC)\wx_cmdlg.h
+$(COMMDIR)\y_tab.obj: $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
-$(MSWINC)/wx_win.h: $(BASEINC)/wb_win.h
-$(MSWINC)/wx_main.h: $(BASEINC)/wb_main.h
-$(MSWINC)/wx_frame.h: $(BASEINC)/wb_frame.h
-$(MSWINC)/wx_panel.h: $(BASEINC)/wb_panel.h
-$(MSWINC)/wx_text.h: $(BASEINC)/wb_text.h
-$(MSWINC)/wx_dialg.h: $(BASEINC)/wb_dialg.h
-$(MSWINC)/wx_ipc.h: $(BASEINC)/wb_ipc.h
-$(MSWINC)/wx_gdi.h: $(BASEINC)/wb_gdi.h
-$(MSWINC)/wx_event.h: $(BASEINC)/wb_event.h
-$(MSWINC)/wx_canvs.h: $(BASEINC)/wb_canvs.h
-$(MSWINC)/wx_mf.h: $(BASEINC)/wb_mf.h
-$(MSWINC)/wx_item.h: $(BASEINC)/wb_item.h
-$(MSWINC)/wx_buttn.h: $(BASEINC)/wb_buttn.h
-$(MSWINC)/wx_messg.h: $(BASEINC)/wb_messg.h
-$(MSWINC)/wx_choic.h: $(BASEINC)/wb_choic.h
-$(MSWINC)/wx_check.h: $(BASEINC)/wb_check.h
-$(MSWINC)/wx_lbox.h: $(BASEINC)/wb_lbox.h
-$(MSWINC)/wx_txt.h: $(BASEINC)/wb_txt.h
-$(MSWINC)/wx_mtxt.h: $(BASEINC)/wb_mtxt.h
-$(MSWINC)/wx_slidr.h: $(BASEINC)/wb_slidr.h
-$(MSWINC)/wx_menu.h: $(BASEINC)/wb_menu.h
+$(COMMDIR)\y_tab.c: $(COMMDIR)\dosyacc.c
+ copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+$(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
+ copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
-clean:
- -del *.obj
+#$(COMMDIR)\cmndata.obj: $(COMMDIR)\cmndata.cpp
+# *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
layout.obj &
log.obj &
memory.obj &
+ mimetype.obj &
module.obj &
object.obj &
prntbase.obj &
memory.obj: $(COMMDIR)\memory.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+mimetype.obj: $(COMMDIR)\mimetype.cpp
+ *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
module.obj: $(COMMDIR)\module.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
#ifndef WX_PRECOMP
#include "wx/menu.h"
+#include "wx/font.h"
+#include "wx/bitmap.h"
+#include "wx/settings.h"
+#include "wx/font.h"
#endif
#include "wx/ownerdrw.h"
#ifndef WX_PRECOMP
#include "wx/setup.h"
+#include "wx/event.h"
#include "wx/app.h"
#include "wx/utils.h"
#endif
{
win = new wxRadioButton;
}
-#ifdef __WIN32__
+#if defined(__WIN32__) && defined(BS_BITMAP)
else if (style & BS_BITMAP)
{
// TODO: how to find the bitmap?
if ((style1 == SS_LEFT) || (style1 == SS_RIGHT) || (style1 == SS_SIMPLE))
win = new wxStaticText;
-#ifdef __WIN32__
+#if defined(__WIN32__) && defined(BS_BITMAP)
else if (style1 == SS_BITMAP)
{
win = new wxStaticBitmap;
#include <wx/log.h>
#include <wx/imaglist.h>
+#include <wx/event.h>
+#include <wx/control.h>
#include <wx/notebook.h>
#include <wx/msw/private.h>
// Windows standard headers
#ifndef __WIN95__
- #error "wxNotebook is not supported under Windows 3.1"
+ #error "wxNotebook is only supported Windows 95 and above"
#endif //Win95
#include <windowsx.h> // for SetWindowFont
#endif
#ifndef WX_PRECOMP
+ #include "wx/font.h"
+ #include "wx/bitmap.h"
+ #include "wx/dcmemory.h"
#include "wx/menu.h"
+ #include "wx/utils.h"
#endif
#include "wx/ownerdrw.h"
#include <windows.h>
+#ifdef DrawText
+#undef DrawText
+#endif
+
// ============================================================================
// implementation of wxOwnerDrawn class
// ============================================================================
m_nMarginWidth = ms_nLastMarginWidth;
}
-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK)
size_t wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK);
#else // # what is the reasonable default?
size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
// Win32 GDI functions and not wxWindows ones. Might help to whoever decides to
// port this code to X. (VZ)
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__SC__)
#define O_DRAW_NATIVE_API // comments below explain why I use it
#endif
// then draw a check mark into it
RECT rect = { 0, 0, GetMarginWidth(), m_nHeight };
+#ifndef __SC__
DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
+#endif
// finally copy it to screen DC and clean up
BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight,
#ifndef WX_PRECOMP
#include "wx/setup.h"
+#include "wx/window.h"
#endif
#include "wx/msw/private.h"
#endif
#include <windows.h>
+#include <wx/palette.h>
+#include <wx/bitmap.h>
#include <wx/msw/pngread.h>
#include <wx/msw/dibutils.h>
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/setup.h"
+#include "wx/bitmap.h"
+#include "wx/brush.h"
#include "wx/radiobox.h"
#endif
void wxRadioBox::SetLabel(const wxString& label)
{
- if (m_hWnd && label)
+ if (m_hWnd)
SetWindowText((HWND) m_hWnd, label);
}
#include <stdio.h>
#include "wx/setup.h"
#include "wx/radiobut.h"
+#include "wx/brush.h"
#endif
#include "wx/msw/private.h"
#include <wx/string.h>
#endif //WX_PRECOMP
+#include <wx/event.h>
#include <wx/app.h>
#include <wx/log.h>
#include <wx/config.h>
return FALSE;
#ifdef __WIN32__
- m_dwLastError = RegDeleteValue((HKEY) m_hKey, szValue);
+ m_dwLastError = RegDeleteValue((HKEY) m_hKey, (char*) (const char*) szValue);
if ( m_dwLastError != ERROR_SUCCESS ) {
wxLogSysError(m_dwLastError, _("can't delete value '%s' from key '%s'"),
szValue, GetName().c_str());
#ifdef __WIN32__
if ( CONST_CAST Open() ) {
- return RegQueryValueEx((HKEY) m_hKey, szValue, RESERVED,
+ return RegQueryValueEx((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,
NULL, NULL, NULL) == ERROR_SUCCESS;
}
else
return Type_None;
DWORD dwType;
- m_dwLastError = RegQueryValueEx((HKEY) m_hKey, szValue, RESERVED,
+ m_dwLastError = RegQueryValueEx((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,
&dwType, NULL, NULL);
if ( m_dwLastError != ERROR_SUCCESS ) {
wxLogSysError(m_dwLastError, _("can't read value of key '%s'"),
if ( CONST_CAST Open() ) {
DWORD dwType, dwSize = sizeof(DWORD);
RegString pBuf = (RegString)plValue;
- m_dwLastError = RegQueryValueEx((HKEY) m_hKey, szValue, RESERVED,
+ m_dwLastError = RegQueryValueEx((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,
&dwType, pBuf, &dwSize);
if ( m_dwLastError != ERROR_SUCCESS ) {
wxLogSysError(m_dwLastError, _("can't read value of key '%s'"),
#ifdef __WIN32__
// first get the type and size of the data
DWORD dwType, dwSize;
- m_dwLastError = RegQueryValueEx((HKEY) m_hKey, szValue, RESERVED,
+ m_dwLastError = RegQueryValueEx((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,
&dwType, NULL, &dwSize);
if ( m_dwLastError == ERROR_SUCCESS ) {
RegString pBuf = (RegString)strValue.GetWriteBuf(dwSize);
- m_dwLastError = RegQueryValueEx((HKEY) m_hKey, szValue, RESERVED,
+ m_dwLastError = RegQueryValueEx((HKEY) m_hKey, (char*) (const char*) szValue, RESERVED,
&dwType, pBuf, &dwSize);
strValue.UngetWriteBuf();
if ( m_dwLastError == ERROR_SUCCESS ) {
return ::GetSystemMetrics(SM_CXDOUBLECLK);
case wxSYS_DCLICK_Y:
return ::GetSystemMetrics(SM_CYDOUBLECLK);
-#ifdef __WIN32__
+#if defined(__WIN32__) && defined(SM_CXDRAG)
case wxSYS_DRAG_X:
return ::GetSystemMetrics(SM_CXDRAG);
case wxSYS_DRAG_Y:
return ::GetSystemMetrics(SM_CXSCREEN);
case wxSYS_SCREEN_Y:
return ::GetSystemMetrics(SM_CYSCREEN);
-#ifdef __WIN32__
+
+#if defined(__WIN32__) && defined(SM_CXSIZEFRAME)
case wxSYS_FRAMESIZE_X:
return ::GetSystemMetrics(SM_CXSIZEFRAME);
case wxSYS_FRAMESIZE_Y:
return ::GetSystemMetrics(SM_CYCAPTION);
case wxSYS_MENU_Y:
return ::GetSystemMetrics(SM_CYMENU);
-#ifdef __WIN32__
+#if defined(__WIN32__) && defined(SM_NETWORK)
case wxSYS_NETWORK_PRESENT:
return ::GetSystemMetrics(SM_NETWORK) & 0x0001;
#endif
case wxSYS_PENWINDOWS_PRESENT:
return ::GetSystemMetrics(SM_PENWINDOWS);
-#ifdef __WIN32__
+#if defined(__WIN32__) && defined(SM_SHOWSOUNDS)
case wxSYS_SHOW_SOUNDS:
return ::GetSystemMetrics(SM_SHOWSOUNDS);
#endif
#include <stdio.h>
#endif
+#include "wx/utils.h"
+#include "wx/brush.h"
#include "wx/msw/slidrmsw.h"
#include "wx/msw/private.h"
#endif
#ifndef WX_PRECOMP
-#include "wx.h"
+#include "wx/wx.h"
#endif
#if defined(__WIN95__)
bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
{
long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
-#ifdef __WIN32__
+#if defined(__WIN32__) && defined(SS_BITMAP)
if ((style & 0xFF) == SS_BITMAP)
{
// Should we call Default() here?
#include "wx/dcclient.h"
#endif
+#ifdef __WIN95__
+
#include "wx/log.h"
#include "wx/generic/statusbr.h"
#include <windows.h>
#include <windowsx.h>
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__)
#include <commctrl.h>
#endif
SetFieldsWidth();
}
-#endif //USE_NATIVE_STATUSBAR
\ No newline at end of file
+#endif
+ // __WIN95__
+#endif
+ // wxUSE_NATIVE_STATUSBAR
#endif
#ifndef WX_PRECOMP
+#include "wx/event.h"
#include "wx/app.h"
+#include "wx/brush.h"
#endif
#include "wx/stattext.h"
#endif
#ifndef WX_PRECOMP
-#include "wx.h"
+#include "wx/wx.h"
#endif
#if defined(__WIN95__)
#endif
#ifndef WX_PRECOMP
-#include "wx.h"
+#include "wx/wx.h"
#endif
#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR && defined(__WIN95__)
#endif
#ifndef WX_PRECOMP
-#include "wx.h"
+#include "wx/wx.h"
#endif
#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
#include <stdlib.h>
#include "wx/tbarmsw.h"
+#include "wx/event.h"
#include "wx/app.h"
+#include "wx/bitmap.h"
#include "wx/msw/private.h"
#include "wx/msw/dib.h"
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#include "wx/settings.h"
+#include "wx/brush.h"
+#include "wx/utils.h"
+#include "wx/log.h"
#endif
#if wxUSE_CLIPBOARD
bool wxTextCtrl::LoadFile(const wxString& file)
{
- if (!FileExists(WXSTRINGCAST file))
+ if (!wxFileExists(WXSTRINGCAST file))
return FALSE;
m_fileName = file;
#if wxUSE_IOSTREAMH
if ( allocate()==EOF )
{
- wxError("Streambuf allocation failed","Internal error");
+ wxLogError("Streambuf allocation failed");
return EOF;
}
#endif
#ifndef WX_PRECOMP
#include "wx/setup.h"
#include "wx/list.h"
+ #include "wx/event.h"
#include "wx/app.h"
#endif
if (majorVsn) *majorVsn = 0;
if (minorVsn) *minorVsn = 0;
-#ifdef WIN32
+#if defined(__WIN32__) && !defined(__SC__)
OSVERSIONINFO info;
memset(&info, 0, sizeof(OSVERSIONINFO));
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
return wxWINDOWS; // error if we get here, return generic value
#else
// Win16 code...
- int retValue ;
+ int retValue = 0;
# ifdef __WINDOWS_386__
retValue = wxWIN386;
# else
#include "wx/setup.h"
#include "wx/utils.h"
#include "wx/app.h"
+#include "wx/intl.h"
#endif
#include "wx/log.h"
#include "wx/panel.h"
#include "wx/layout.h"
#include "wx/dialog.h"
+#include "wx/frame.h"
#include "wx/listbox.h"
#include "wx/button.h"
#include "wx/settings.h"
projects / wxWidgets.git / commitdiff
