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

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/wx/os2/accel.h
View File

@@ -53,28 +53,32 @@ class WXDLLEXPORT wxAcceleratorTable: public wxObject
DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
public:
wxAcceleratorTable();
wxAcceleratorTable(const wxString& resource); // Load from .rc resource
wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array
wxAcceleratorTable(const wxString& rsResource); // Load from .rc resource
wxAcceleratorTable( int n
,wxAcceleratorEntry vaEntries[]
); // Load from array
// Copy constructors
inline wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
inline wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); }
inline wxAcceleratorTable(const wxAcceleratorTable& rAccel) { Ref(rAccel); }
inline wxAcceleratorTable(const wxAcceleratorTable* pAccel) { if (pAccel) Ref(*pAccel); }
~wxAcceleratorTable();
inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel)
{ if (*this == accel) return (*this); Ref(accel); return *this; };
inline bool operator == (const wxAcceleratorTable& accel)
{ return m_refData == accel.m_refData; };
inline bool operator != (const wxAcceleratorTable& accel)
{ return m_refData != accel.m_refData; };
inline wxAcceleratorTable& operator = (const wxAcceleratorTable& rAccel)
{ if (*this == rAccel) return (*this); Ref(rAccel); return *this; };
inline bool operator == (const wxAcceleratorTable& rAccel)
{ return m_refData == rAccel.m_refData; };
inline bool operator != (const wxAcceleratorTable& rAccel)
{ return m_refData != rAccel.m_refData; };
bool Ok() const;
void SetHACCEL(WXHACCEL hAccel);
WXHACCEL GetHACCEL() const;
WXHACCEL GetHACCEL(void) const;
// translate the accelerator, return TRUE if done
bool Translate(wxWindow *window, WXMSG *msg) const;
bool Translate( WXHWND hWnd
,WXMSG* pMsg
) const;
};
WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;

299
include/wx/os2/dc.h
View File

@@ -78,148 +78,253 @@ public:
// implement base class pure virtuals
// ----------------------------------
virtual void Clear();
virtual void Clear(void);
virtual bool StartDoc(const wxString& message);
virtual void EndDoc();
virtual bool StartDoc(const wxString& rsMessage);
virtual void EndDoc(void);
virtual void StartPage();
virtual void EndPage();
virtual void StartPage(void);
virtual void EndPage(void);
virtual void SetFont(const wxFont& font);
virtual void SetPen(const wxPen& pen);
virtual void SetBrush(const wxBrush& brush);
virtual void SetBackground(const wxBrush& brush);
virtual void SetBackgroundMode(int mode);
virtual void SetPalette(const wxPalette& palette);
virtual void SetFont(const wxFont& rFont);
virtual void SetPen(const wxPen& rPen);
virtual void SetBrush(const wxBrush& rBrush);
virtual void SetBackground(const wxBrush& rBrush);
virtual void SetBackgroundMode(int nMode);
virtual void SetPalette(const wxPalette& rPalette);
virtual void DestroyClippingRegion();
virtual void DestroyClippingRegion(void);
virtual wxCoord GetCharHeight() const;
virtual wxCoord GetCharWidth() const;
virtual void DoGetTextExtent(const wxString& string,
wxCoord *x, wxCoord *y,
wxCoord *descent = NULL,
wxCoord *externalLeading = NULL,
wxFont *theFont = NULL) const;
virtual wxCoord GetCharHeight(void) const;
virtual wxCoord GetCharWidth(void) const;
virtual void DoGetTextExtent( const wxString& rsString
,wxCoord* pX
,wxCoord* pY
,wxCoord* pDescent = NULL
,wxCoord* pExternalLeading = NULL
,wxFont* pTheFont = NULL
) const;
virtual bool CanDrawBitmap(void) const;
virtual bool CanGetTextExtent(void) const;
virtual int GetDepth(void) const;
virtual wxSize GetPPI(void) const;
virtual bool CanDrawBitmap() const;
virtual bool CanGetTextExtent() const;
virtual int GetDepth() const;
virtual wxSize GetPPI() const;
virtual void SetMapMode(int mode);
virtual void SetUserScale(double x, double y);
virtual void SetSystemScale(double x, double y);
virtual void SetLogicalScale(double x, double y);
virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
virtual void SetLogicalFunction(int function);
virtual void SetMapMode(int nMode);
virtual void SetUserScale( double dX
,double dY
);
virtual void SetSystemScale( double dX
,double dY
);
virtual void SetLogicalScale( double dX
,double dY
);
virtual void SetLogicalOrigin( wxCoord vX
,wxCoord vY
);
virtual void SetDeviceOrigin( wxCoord vX
,wxCoord vY
);
virtual void SetAxisOrientation( bool bXLeftRight
,bool bYBottomUp
);
virtual void SetLogicalFunction(int nFunction);
// implementation from now on
// --------------------------
virtual void SetRop(WXHDC cdc);
virtual void DoClipping(WXHDC cdc);
virtual void SelectOldObjects(WXHDC dc);
virtual void SetRop(WXHDC hCdc);
virtual void SelectOldObjects(WXHDC hDc);
wxWindow *GetWindow() const { return m_canvas; }
void SetWindow(wxWindow *win) { m_canvas = win; }
wxWindow* GetWindow(void) const { return m_pCanvas; }
void SetWindow(wxWindow* pWin) { m_pCanvas = pWin; }
WXHDC GetHDC() const { return m_hDC; }
void SetHDC(WXHDC dc, bool bOwnsDC = FALSE)
WXHDC GetHDC(void) const { return m_hDC; }
void SetHDC( WXHDC hDc
,bool bOwnsDC = FALSE
)
{
m_hDC = dc;
m_hDC = hDc;
m_bOwnsDC = bOwnsDC;
}
const wxBitmap& GetSelectedBitmap(void) const { return m_vSelectedBitmap; }
wxBitmap& GetSelectedBitmap(void) { return m_vSelectedBitmap; }
protected:
virtual void DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
int style = wxFLOOD_SURFACE);
virtual void DoFloodFill( wxCoord vX
,wxCoord vY
,const wxColour& rCol
,int nStyle = wxFLOOD_SURFACE
);
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
virtual bool DoGetPixel( wxCoord vX
,wxCoord vY
,wxColour* pCol
) const;
virtual void DoDrawPoint(wxCoord x, wxCoord y);
virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
virtual void DoDrawPoint( wxCoord vX
,wxCoord vY
);
virtual void DoDrawLine( wxCoord vX1
,wxCoord vY1
,wxCoord vX2
,wxCoord vY2
);
virtual void DoDrawArc(wxCoord x1, wxCoord y1,
wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc);
virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
double sa, double ea);
virtual void DoDrawArc( wxCoord vX1
,wxCoord vY1
,wxCoord vX2
,wxCoord vY2
,wxCoord vXc
,wxCoord vYc
);
virtual void DoDrawCheckMark( wxCoord vX
,wxCoord vY
,wxCoord vWidth
,wxCoord vHeight
);
virtual void DoDrawEllipticArc( wxCoord vX
,wxCoord vY
,wxCoord vW
,wxCoord vH
,double dSa
,double dEa
);
virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
wxCoord width, wxCoord height,
double radius);
virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
virtual void DoDrawRectangle( wxCoord vX
,wxCoord vY
,wxCoord vWidth
,wxCoord vHeight
);
virtual void DoDrawRoundedRectangle( wxCoord vX
,wxCoord vY
,wxCoord vWidth
,wxCoord vHeight
,double dRadius
);
virtual void DoDrawEllipse( wxCoord vX
,wxCoord vY
,wxCoord vWidth
,wxCoord vHeight
);
virtual void DoCrossHair(wxCoord x, wxCoord y);
virtual void DoCrossHair( wxCoord vX
,wxCoord vY
);
virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
bool useMask = FALSE);
virtual void DoDrawIcon( const wxIcon& rIcon
,wxCoord vX
,wxCoord vY
);
virtual void DoDrawBitmap( const wxBitmap& rBmp
,wxCoord vX
,wxCoord vY
,bool bUseMask = FALSE
);
virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
double angle);
virtual void DoDrawText( const wxString& rsText
,wxCoord vX
,wxCoord vY
);
virtual void DoDrawRotatedText( const wxString& rsText
,wxCoord vX
,wxCoord vY
,double dAngle
);
virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc,
int rop = wxCOPY, bool useMask = FALSE);
virtual bool DoBlit( wxCoord vXdest
,wxCoord vYdest
,wxCoord vWidth
,wxCoord vHeight
,wxDC* pSource
,wxCoord vXsrc
,wxCoord vYsrc
,int nRop = wxCOPY
,bool bUseMask = FALSE
);
// this is gnarly - we can't even call this function DoSetClippingRegion()
// because of virtual function hiding
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
wxCoord width, wxCoord height);
virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
wxCoord *width, wxCoord *height)
virtual void DoSetClippingRegionAsRegion(const wxRegion& rRegion);
virtual void DoSetClippingRegion( wxCoord vX
,wxCoord vY
,wxCoord vWidth
,wxCoord vHeight
);
virtual void DoGetClippingRegion( wxCoord* pX
,wxCoord* pY
,wxCoord* pWidth
,wxCoord* pHeight)
{
GetClippingBox(x, y, width, height);
GetClippingBox( pX
,pY
,pWidth
,pHeight
);
}
virtual void DoGetSize(int *width, int *height) const;
virtual void DoGetSizeMM(int* width, int* height) const;
virtual void DoGetSize( int* pWidth
,int* pHeight
) const;
virtual void DoGetSizeMM( int* pWidth
,int* pHeight
) const;
virtual void DoDrawLines(int n, wxPoint points[],
wxCoord xoffset, wxCoord yoffset);
virtual void DoDrawPolygon(int n, wxPoint points[],
wxCoord xoffset, wxCoord yoffset,
int fillStyle = wxODDEVEN_RULE);
virtual void DoDrawLines( int n
,wxPoint vaPoints[]
,wxCoord vXoffset
,wxCoord yYoffset
);
virtual void DoDrawPolygon( int n
,wxPoint vaPoints[]
,wxCoord vXoffset
,wxCoord vYoffset
,int nFillStyle = wxODDEVEN_RULE
);
#if wxUSE_SPLINES
virtual void DoDrawSpline(wxList *points);
virtual void DoDrawSpline(wxList* pPoints);
#endif // wxUSE_SPLINES
// OS2-specific member variables
int m_windowExtX;
int m_windowExtY;
//
// common part of DoDrawText() and DoDrawRotatedText()
//
void DrawAnyText( const wxString& rsText
,wxCoord vX
,wxCoord vY
);
// OS2-specific member variables ?? do we even need this under OS/2?
int m_nWindowExtX;
int m_nWindowExtY;
//
// the window associated with this DC (may be NULL)
wxWindow *m_canvas;
wxBitmap m_selectedBitmap;
//
wxWindow* m_pCanvas;
wxBitmap m_vSelectedBitmap;
//
// TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it
bool m_bOwnsDC:1;
//
bool m_bOwnsDC:1;
//
// our HDC and its usage count: we only free it when the usage count drops
// to 0
WXHDC m_hDC;
int m_hDCCount;
//
WXHDC m_hDC;
int m_nDCCount;
//
// Store all old GDI objects when do a SelectObject, so we can select them
// back in (this unselecting user's objects) so we can safely delete the
// DC.
WXHBITMAP m_oldBitmap;
WXHPEN m_oldPen;
WXHBRUSH m_oldBrush;
WXHFONT m_oldFont;
WXHPALETTE m_oldPalette;
float m_scaleFactor; // wxPSDC wants to have this. Will disappear.
//
WXHBITMAP m_hOldBitmap;
WXHPEN m_hOldPen;
WXHBRUSH m_hOldBrush;
WXHFONT m_hOldFont;
WXHPALETTE m_hOldPalette;
};
#endif
// _WX_DC_H_

3
include/wx/os2/filedlg.h
View File

@@ -39,8 +39,11 @@ public:
inline wxString GetMessage() const { return m_message; }
inline wxString GetPath() const { return m_path; }
inline void GetPaths(wxArrayString& a) { a.Empty(); a.Add(m_path); }
inline wxString GetDirectory() const { return m_dir; }
inline wxString GetFilename() const { return m_fileName; }
inline void GetFilenames(wxArrayString& a) { a.Empty();
a.Add( m_fileName); }
inline wxString GetWildcard() const { return m_wildCard; }
inline long GetStyle() const { return m_dialogStyle; }
inline int GetFilterIndex() const { return m_filterIndex ; }

3
include/wx/os2/frame.h
View File

@@ -102,6 +102,7 @@ public:
#endif // wxUSE_STATUSBAR
WXHMENU GetWinMenu() const { return m_hMenu; }
WXHWND GetFrame() const { return m_hFrame; }
// Returns the origin of client area (may be different from (0,0) if the
// frame has a toolbar)
@@ -217,7 +218,7 @@ private:
WXHWND m_hVScroll;
//
// Swp structures for various client data
// Swp structures for various client data
// DW: Better off in attached RefData?
//
SWP m_vSwp;

5
include/wx/os2/helpwin.h
View File

@@ -42,8 +42,9 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
protected:
wxString m_helpFile;
private:
// virtual function hiding supression :: do not use
bool Initialize(const wxString& file, int WXUNUSED(server) ) { return(Initialize(file)); }
// virtual function hiding supression :: do not use
bool Initialize(const wxString& rFile, int WXUNUSED(nServer) ) { return(Initialize(rFile)); }
bool DisplaySection(const wxString& rSection) { return wxHelpControllerBase::DisplaySection(rSection); }
};
#endif

5
include/wx/os2/menu.h
View File

@@ -154,6 +154,11 @@ private:
//
WXHMENU m_hMenu;
//
// The helper variable for creating unique IDs.
//
static USHORT m_nextMenuId;
#if wxUSE_ACCEL
//
// The accelerators for our menu items

35
include/wx/os2/msgdlg.h
View File

@@ -22,25 +22,34 @@
WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
class WXDLLEXPORT wxMessageDialog: public wxDialog
class WXDLLEXPORT wxMessageDialog : public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxMessageDialog)
protected:
wxString m_caption;
wxString m_message;
long m_dialogStyle;
wxWindow * m_parent;
public:
wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
wxMessageDialog( wxWindow* pParent
,const wxString& rsMessage
,const wxString& rsCaption = wxMessageBoxCaptionStr
,long lStyle = wxOK|wxCENTRE
,const wxPoint& rPos = wxDefaultPosition
);
int ShowModal();
};
int ShowModal(void);
protected:
wxString m_sCaption;
wxString m_sMessage;
long m_lDialogStyle;
wxWindow* m_pParent;
}; // end of CLASS wxMessageDialog
int WXDLLEXPORT wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
long style = wxOK|wxCENTRE,
wxWindow *parent = NULL, int x = -1, int y = -1);
int WXDLLEXPORT wxMessageBox( const wxString& rsMessage
,const wxString& rsCaption = wxMessageBoxCaptionStr
,long lStyle = wxOK|wxCENTRE
,wxWindow* pParent = NULL
,int nX = -1
,int nY = -1
);
#endif
// _WX_MSGBOXDLG_H_

1
include/wx/os2/private.h
View File

@@ -18,6 +18,7 @@
#define INCL_PM
#define INCL_GPI
#define INCL_WINSYS
#define INCL_SHLERRORS
#include <os2.h>
class WXDLLEXPORT wxFont;

28
include/wx/os2/setup.h
View File

@@ -149,7 +149,11 @@
// since you may well need to output
// an error log in a production
// version (or non-debugging beta)
#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
#else
#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
#endif
// In debug mode, cause new and delete to be redefined globally.
// If this causes problems (e.g. link errors), set this to 0.
@@ -167,13 +171,23 @@
#define wxUSE_ODBC 1
// Define 1 to use ODBC classes
#define wxODBC_FWD_ONLY_CURSORS 1
// Some databases/ODBC drivers only allow forward scrolling cursors.
// Unless you specifically want to use backward scrolling
// cursors, and you know that all of the databases/ODBC drivers
// that you will use these odbc classes with allow backward
// scrolling cursors, this setting should remain set to 1
// for maximum database/driver compatibilty
#define wxODBC_FWD_ONLY_CURSORS 1
// For backward compatibility reasons, this parameter now only
// controls the default scrolling method used by cursors. This
// default behavior can be overriden by setting the second param
// of wxDB::GetDbConnection() to indicate whether the connection
// (and any wxTable()s that use the connection) should support
// forward only scrolling of cursors, or both forward and backward
// Support for backward scrolling cursors is dependent on the
// data source as well as the ODBC driver being used.
#define wxODBC_BACKWARD_COMPATABILITY 0
// Default is 0. Set to 1 to use the deprecated classes, enum
// types, function, member variables. With a setting of 1, full
// backward compatability with the 2.0.x release is possible.
// It is STRONGLY recommended that this be set to 0, as
// future development will be done only on the non-deprecated
// functions/classes/member variables/etc.
#define wxUSE_IOSTREAMH 1
// VC++ 4.2 and above allows <iostream> and <iostream.h>

28
include/wx/os2/setup0.h
View File

@@ -149,7 +149,11 @@
// since you may well need to output
// an error log in a production
// version (or non-debugging beta)
#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
#else
#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
#endif
// In debug mode, cause new and delete to be redefined globally.
// If this causes problems (e.g. link errors), set this to 0.
@@ -167,13 +171,23 @@
#define wxUSE_ODBC 1
// Define 1 to use ODBC classes
#define wxODBC_FWD_ONLY_CURSORS 1
// Some databases/ODBC drivers only allow forward scrolling cursors.
// Unless you specifically want to use backward scrolling
// cursors, and you know that all of the databases/ODBC drivers
// that you will use these odbc classes with allow backward
// scrolling cursors, this setting should remain set to 1
// for maximum database/driver compatibilty
#define wxODBC_FWD_ONLY_CURSORS 1
// For backward compatibility reasons, this parameter now only
// controls the default scrolling method used by cursors. This
// default behavior can be overriden by setting the second param
// of wxDB::GetDbConnection() to indicate whether the connection
// (and any wxTable()s that use the connection) should support
// forward only scrolling of cursors, or both forward and backward
// Support for backward scrolling cursors is dependent on the
// data source as well as the ODBC driver being used.
#define wxODBC_BACKWARD_COMPATABILITY 0
// Default is 0. Set to 1 to use the deprecated classes, enum
// types, function, member variables. With a setting of 1, full
// backward compatability with the 2.0.x release is possible.
// It is STRONGLY recommended that this be set to 0, as
// future development will be done only on the non-deprecated
// functions/classes/member variables/etc.
#define wxUSE_IOSTREAMH 1
// VC++ 4.2 and above allows <iostream> and <iostream.h>