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

no message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-10-14 22:36:24 +00:00
parent 4c0a2c5c3e
commit fb46a9a6c6
30 changed files with 1176 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/os2/app.h
View File

@@ -101,14 +101,6 @@ protected:
DECLARE_EVENT_TABLE()
};
#if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance, char *lpszCmdLine,
int nCmdShow, bool enterLoop = TRUE);
#else
int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance);
#endif
#endif
// _WX_APP_H_

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

@@ -12,152 +12,113 @@
#ifndef _WX_DC_H_
#define _WX_DC_H_
#ifdef __GNUG__
#pragma interface "dc.h"
#endif
#include "wx/defs.h"
#include "wx/dc.h"
#include "wx/window.h"
#include "wx/pen.h"
#include "wx/brush.h"
#include "wx/icon.h"
#include "wx/font.h"
#include "wx/gdicmn.h"
// ---------------------------------------------------------------------------
// macros
// ---------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// constants
//-----------------------------------------------------------------------------
// Logical to device
// Absolute
#define XLOG2DEV(x) (x)
#define YLOG2DEV(y) (y)
#ifndef MM_TEXT
#define MM_TEXT 0
#define MM_ISOTROPIC 1
#define MM_ANISOTROPIC 2
#define MM_LOMETRIC 3
#define MM_HIMETRIC 4
#define MM_TWIPS 5
#define MM_POINTS 6
#define MM_METRIC 7
#endif
// Relative
#define XLOG2DEVREL(x) (x)
#define YLOG2DEVREL(y) (y)
//-----------------------------------------------------------------------------
// global variables
//-----------------------------------------------------------------------------
// Device to logical
// Absolute
#define XDEV2LOG(x) (x)
extern int wxPageNumber;
#define YDEV2LOG(y) (y)
//-----------------------------------------------------------------------------
// wxDC
//-----------------------------------------------------------------------------
// Relative
#define XDEV2LOGREL(x) (x)
#define YDEV2LOGREL(y) (y)
class WXDLLEXPORT wxDC: public wxDCBase
/*
* Have the same macros as for XView but not for every operation:
* just for calculating window/viewport extent (a better way of scaling).
*/
// Logical to device
// Absolute
#define MS_XLOG2DEV(x) LogicalToDevice(x)
#define MS_YLOG2DEV(y) LogicalToDevice(y)
// Relative
#define MS_XLOG2DEVREL(x) LogicalToDeviceXRel(x)
#define MS_YLOG2DEVREL(y) LogicalToDeviceYRel(y)
// Device to logical
// Absolute
#define MS_XDEV2LOG(x) DeviceToLogicalX(x)
#define MS_YDEV2LOG(y) DeviceToLogicalY(y)
// Relative
#define MS_XDEV2LOGREL(x) DeviceToLogicalXRel(x)
#define MS_YDEV2LOGREL(y) DeviceToLogicalYRel(y)
#define YSCALE(y) (yorigin - (y))
#define wx_round(a) (int)((a)+.5)
class WXDLLEXPORT wxDC : public wxDCBase
{
DECLARE_ABSTRACT_CLASS(wxDC)
DECLARE_DYNAMIC_CLASS(wxDC)
public:
public:
wxDC();
~wxDC();
wxDC(void);
~wxDC(void);
// implement base class pure virtuals
// ----------------------------------
virtual void BeginDrawing(void) { };
virtual void EndDrawing(void) { };
virtual void Clear();
//-----------------------------------------------------------------------------
// Pure virtuals from wxDCBase that need defining
//-----------------------------------------------------------------------------
virtual bool CanDrawBitmap(void) const { return TRUE; };
virtual bool CanGetTextExtent(void) const { return TRUE; };
virtual int GetDepth(void) const;
virtual wxSize GetPPI(void) const;
virtual void GetTextExtent( const wxString& string
,long* width
,long* height
,long* descent = NULL
,long* externalLeading = NULL
,wxFont* theFont = NULL
) const;
virtual long GetCharWidth(void) const;
virtual long GetCharHeight(void) const;
virtual void Clear(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 SetLogicalFunction(int function);
virtual void SetBackgroundMode(int mode);
virtual void SetPalette(const wxPalette& palette);
virtual void SetMapMode(int mode);
virtual void DestroyClippingRegion(void);
virtual void SetUserScale(double x, double y);
virtual void SetLogicalOrigin(long x, long y);
virtual void SetDeviceOrigin(long x, long y);
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
virtual bool StartDoc(const wxString& message);
virtual void EndDoc();
virtual void DoFloodFill( long x
,long y
,const wxColour& col
,int style = wxFLOOD_SURFACE
);
virtual bool DoGetPixel(long x, long y, wxColour *col) const;
virtual void DoDrawPoint(long x, long y);
virtual void DoDrawLine(long x1, long y1, long x2, long y2);
virtual void DoDrawArc(long x1, long y1,
long x2, long y2,
long xc, long yc
);
virtual void DoDrawEllipticArc( long x, long y
,long w, long h
,double sa, double ea
);
virtual void DoDrawRectangle(long x, long y, long width, long height);
virtual void DoDrawRoundedRectangle( long x, long y
,long width, long height
,double radius
);
virtual void DoDrawEllipse(long x, long y, long width, long height);
virtual void DoCrossHair(long x, long y);
virtual void DoDrawIcon(const wxIcon& icon, long x, long y);
virtual void DoDrawBitmap( const wxBitmap &bmp
,long x, long y
,bool useMask = FALSE
);
virtual void DoDrawText(const wxString& text, long x, long y);
virtual bool DoBlit( long xdest, long ydest
,long width, long height
,wxDC *source
,long xsrc, long ysrc
,int rop = wxCOPY, bool useMask = FALSE
);
virtual void DoGetSize(int *width, int *height) const;
virtual void DoGetSizeMM(int* width, int* height) const;
virtual void DoDrawLines( int n, wxPoint points[]
,long xoffset, long yoffset
);
virtual void DoDrawPolygon( int n, wxPoint points[]
,long xoffset, long yoffset
,int fillStyle = wxODDEVEN_RULE
);
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
virtual void DoSetClippingRegion( long x, long y
,long width, long height
);
#if wxUSE_SPLINES
virtual void DoDrawSpline(wxList *points);
#endif
virtual void StartPage();
virtual void EndPage();
// OS2-specific member variables
int m_windowExtX;
int m_windowExtY;
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);
//-----------------------------------------------------------------------------
// Other virtuals from wxDCBase that are overridden here
//-----------------------------------------------------------------------------
virtual void DestroyClippingRegion();
virtual void SetLogicalScale( double x, double y );
virtual long GetCharHeight() const;
virtual long GetCharWidth() const;
virtual void GetTextExtent(const wxString& string,
long *x, long *y,
long *descent = NULL,
long *externalLeading = NULL,
wxFont *theFont = NULL) const;
//-----------------------------------------------------------------------------
// Our own new stuff
//-----------------------------------------------------------------------------
virtual void SetInternalDeviceOrigin( long x, long y );
virtual void GetInternalDeviceOrigin( long *x, long *y );
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(long x, long y);
virtual void SetDeviceOrigin(long x, long y);
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
virtual void SetLogicalFunction(int function);
// implementation from now on
// --------------------------
virtual void SetRop(WXHDC cdc);
virtual void DoClipping(WXHDC cdc);
@@ -173,36 +134,79 @@ class WXDLLEXPORT wxDC: public wxDCBase
m_bOwnsDC = bOwnsDC;
}
private:
#if WXWIN_COMPATIBILITY
// function hiding warning supression
virtual void GetTextExtent( const wxString& string
,long* width
,long* height
,long* descent = NULL
,long* externalLeading = NULL
,wxFont* theFont = NULL
,bool use16 = FALSE
) const
{ wxDCBase::GetTextExtent(string, width, height, descent, externalLeading, theFont, use16); };
#endif
protected:
virtual void DoFloodFill(long x, long y, const wxColour& col,
int style = wxFLOOD_SURFACE);
// ------------------------------------------------------------------------
// Some additional data we need
// ------------------------------------------------------------------------
virtual bool DoGetPixel(long x, long y, wxColour *col) const;
virtual void DoDrawPoint(long x, long y);
virtual void DoDrawLine(long x1, long y1, long x2, long y2);
virtual void DoDrawArc(long x1, long y1,
long x2, long y2,
long xc, long yc);
virtual void DoDrawEllipticArc(long x, long y, long w, long h,
double sa, double ea);
virtual void DoDrawRectangle(long x, long y, long width, long height);
virtual void DoDrawRoundedRectangle(long x, long y,
long width, long height,
double radius);
virtual void DoDrawEllipse(long x, long y, long width, long height);
virtual void DoCrossHair(long x, long y);
virtual void DoDrawIcon(const wxIcon& icon, long x, long y);
virtual void DoDrawBitmap(const wxBitmap &bmp, long x, long y,
bool useMask = FALSE);
virtual void DoDrawText(const wxString& text, long x, long y);
virtual bool DoBlit(long xdest, long ydest, long width, long height,
wxDC *source, long xsrc, long ysrc,
int rop = wxCOPY, bool useMask = 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(long x, long y,
long width, long height);
virtual void DoGetClippingRegion(long *x, long *y,
long *width, long *height)
{
GetClippingBox(x, y, width, height);
}
virtual void DoGetSize(int *width, int *height) const;
virtual void DoGetSizeMM(int* width, int* height) const;
virtual void DoDrawLines(int n, wxPoint points[],
long xoffset, long yoffset);
virtual void DoDrawPolygon(int n, wxPoint points[],
long xoffset, long yoffset,
int fillStyle = wxODDEVEN_RULE);
#if wxUSE_SPLINES
virtual void DoDrawSpline(wxList *points);
#endif // wxUSE_SPLINES
// OS2-specific member variables
int m_windowExtX;
int m_windowExtY;
// the window associated with this DC (may be NULL)
wxWindow *m_canvas;
// Owner canvas and selected in bitmap (if bitmap is GDI object selected)
wxWindow* m_canvas;
wxBitmap m_selectedBitmap;
// TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it
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;
bool m_bOwnsDC:1;
// 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
@@ -213,6 +217,5 @@ protected:
WXHFONT m_oldFont;
WXHPALETTE m_oldPalette;
};
#endif
// _WX_DC_H_

12
include/wx/os2/dcmemory.h
View File

@@ -12,13 +12,9 @@
#ifndef _WX_DCMEMORY_H_
#define _WX_DCMEMORY_H_
#ifdef __GNUG__
#pragma interface "dcmemory.h"
#endif
#include "wx/dcclient.h"
class WXDLLEXPORT wxMemoryDC: public wxPaintDC
class WXDLLEXPORT wxMemoryDC: public wxDC
{
DECLARE_DYNAMIC_CLASS(wxMemoryDC)
@@ -28,11 +24,7 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
~wxMemoryDC(void);
virtual void SelectObject( const wxBitmap& bitmap );
void GetSize( int *width, int *height ) const;
private:
friend wxPaintDC;
wxBitmap m_selected;
virtual void DoGetSize( int *width, int *height ) const;
};
#endif

4
include/wx/os2/dcprint.h
View File

@@ -12,10 +12,6 @@
#ifndef _WX_DCPRINT_H_
#define _WX_DCPRINT_H_
#ifdef __GNUG__
#pragma interface "dcprint.h"
#endif
#if wxUSE_PRINTING_ARCHITECTURE
#include "wx/dc.h"

8
include/wx/os2/dcscreen.h
View File

@@ -1,12 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dcscreen.h
// Purpose: wxScreenDC class
// Author: AUTHOR
// Author: David Webster
// Modified by:
// Created: ??/??/98
// Created: 10/14/99
// RCS-ID: $Id$
// Copyright: (c) AUTHOR
// Licence: wxWindows licence
// Copyright: (c) David Webster
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DCSCREEN_H_

22
include/wx/os2/dialog.h
View File

@@ -1,21 +1,17 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dialog.h
// Purpose: wxDialog class
// Author: AUTHOR
// Author: David Webster
// Modified by:
// Created: ??/??/98
// Created: 10/14/99
// RCS-ID: $Id$
// Copyright: (c) AUTHOR
// Licence: wxWindows licence
// Copyright: (c) David Webster
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DIALOG_H_
#define _WX_DIALOG_H_
#ifdef __GNUG__
#pragma interface "dialog.h"
#endif
#include "wx/panel.h"
WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
@@ -69,18 +65,20 @@ public:
~wxDialog();
// ---------------------------------------------------------------------------
// Virtuals
// ---------------------------------------------------------------------------
virtual bool Destroy();
virtual void DoSetClientSize(int width, int height);
virtual void GetPosition(int *x, int *y) const;
bool Show(bool show);
bool IsShown() const;
void Iconize(bool iconize);
#if WXWIN_COMPATIBILITY
bool Iconized() const { return IsIconized(); };
#endif
virtual bool IsIconized() const;
void Fit();

12
include/wx/os2/dirdlg.h
View File

@@ -1,21 +1,17 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dirdlg.h
// Purpose: wxDirDialog class
// Author: AUTHOR
// Author: David Webster
// Modified by:
// Created: ??/??/98
// Created: 10/14/99
// RCS-ID: $Id$
// Copyright: (c) AUTHOR
// Licence: wxWindows licence
// Copyright: (c) David Webster
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DIRDLG_H_
#define _WX_DIRDLG_H_
#ifdef __GNUG__
#pragma interface "dirdlg.h"
#endif
#include "wx/dialog.h"
WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;

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

@@ -12,10 +12,6 @@
#ifndef _WX_FILEDLG_H_
#define _WX_FILEDLG_H_
#ifdef __GNUG__
#pragma interface "filedlg.h"
#endif
#include "wx/dialog.h"
/*

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

@@ -12,10 +12,6 @@
#ifndef _WX_FRAME_H_
#define _WX_FRAME_H_
#ifdef __GNUG__
#pragma interface "frame.h"
#endif
#include "wx/window.h"
#include "wx/toolbar.h"
#include "wx/os2/accel.h"
@@ -62,9 +58,6 @@ public:
virtual void ClientToScreen(int *x, int *y) const;
virtual void ScreenToClient(int *x, int *y) const;
void SetClientSize(int width, int height);
void GetClientSize(int *width, int *height) const;
void OnSize(wxSizeEvent& event);
void OnMenuHighlight(wxMenuEvent& event);
void OnActivate(wxActivateEvent& event);
@@ -74,7 +67,6 @@ public:
bool Show(bool show);
void DetachMenuBar();
// Set menu bar
void SetMenuBar(wxMenuBar *menu_bar);
virtual wxMenuBar *GetMenuBar() const ;

37
include/wx/os2/pnghand.h Normal file
View File

@@ -0,0 +1,37 @@
/////////////////////////////////////////////////////////////////////////////
// Name: pnghand.h
// Purpose: PNG bitmap handler
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Microsoft, Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma interface "pnghand.h"
#endif
#ifndef _WX_PNGHAND_H_
#define _WX_PNGHAND_H_
class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler
{
DECLARE_DYNAMIC_CLASS(wxPNGFileHandler)
public:
inline wxPNGFileHandler(void)
{
m_name = "PNG bitmap file";
m_extension = "bmp";
m_type = wxBITMAP_TYPE_PNG;
};
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight);
virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
};
#endif
// _WX_PNGHAND_H_

4
include/wx/os2/pngread.h
View File

@@ -46,7 +46,7 @@ protected:
long EfeWidth; // Efective Width
LPBITMAPINFOHEADER lpbi;
BITMAPINFOHEADER2* lpbi;
int bgindex;
wxPalette* Palette;
bool imageOK;
@@ -270,7 +270,7 @@ inline bool wxPNGReaderIter::PrevStep()
Itx -= Stepx;
if (Itx >= 0)
return 1;
else {
else {
Ity -= Stepy;
if (Ity >= 0 && Ity < ima->Height)
{

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

@@ -1,11 +1,11 @@
/////////////////////////////////////////////////////////////////////////////
// Name: setup.h
// Purpose: Configuration for the library
// Author: David Webster
// Author: Julian Smart
// Modified by:
// Created: 04/02/99
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) David Webster
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -110,8 +110,13 @@
#define wxUSE_CARET 1
// Define 1 to use wxCaret class
#define wxUSE_XPM_IN_MSW 1
#define wxUSE_XPM_IN_OS2 1
// Define 1 to support the XPM package in wxBitmap.
#define wxUSE_IMAGE_LOADING_IN_OS2 1
// Use dynamic DIB loading/saving code in utils/dib under OS2.
#define wxUSE_RESOURCE_LOADING_IN_OS2 1
// Use dynamic icon/cursor loading/saving code
// under OS2.
#define wxUSE_WX_RESOURCES 1
// Use .wxr resource mechanism (requires PrologIO library)
@@ -124,6 +129,9 @@
// Set to 0 to disable MDI document/view architecture
#define wxUSE_PRINTING_ARCHITECTURE 1
// Set to 0 to disable print/preview architecture code
#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_OS2 1
// Set to 0 to disable PostScript print/preview architecture code
// under OS/2 PM (just use PM printing).
#define wxUSE_DYNAMIC_CLASSES 1
// If 1, enables provision of run-time type information.
// NOW MANDATORY: don't change.
@@ -270,5 +278,12 @@
#define wxUSE_DRAG_AND_DROP 1
#define wxUSE_PORTABLE_FONTS_IN_OS2 0
// Define 1 to use new portable font scheme in Windows
// (used by default under X)
#define wxUSE_GENERIC_DIALOGS_IN_OS2 0
// Define 1 to use generic dialogs in Windows, even though
// they duplicate native common dialog (e.g. wxColourDialog)
#endif
// _WX_SETUP_H_

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

@@ -110,8 +110,13 @@
#define wxUSE_CARET 1
// Define 1 to use wxCaret class
#define wxUSE_XPM_IN_MSW 1
#define wxUSE_XPM_IN_OS2 1
// Define 1 to support the XPM package in wxBitmap.
#define wxUSE_IMAGE_LOADING_IN_OS2 1
// Use dynamic DIB loading/saving code in utils/dib under OS2.
#define wxUSE_RESOURCE_LOADING_IN_OS2 1
// Use dynamic icon/cursor loading/saving code
// under OS2.
#define wxUSE_WX_RESOURCES 1
// Use .wxr resource mechanism (requires PrologIO library)
@@ -124,6 +129,9 @@
// Set to 0 to disable MDI document/view architecture
#define wxUSE_PRINTING_ARCHITECTURE 1
// Set to 0 to disable print/preview architecture code
#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_OS2 1
// Set to 0 to disable PostScript print/preview architecture code
// under OS/2 PM (just use PM printing).
#define wxUSE_DYNAMIC_CLASSES 1
// If 1, enables provision of run-time type information.
// NOW MANDATORY: don't change.
@@ -270,5 +278,12 @@
#define wxUSE_DRAG_AND_DROP 1
#define wxUSE_PORTABLE_FONTS_IN_OS2 0
// Define 1 to use new portable font scheme in Windows
// (used by default under X)
#define wxUSE_GENERIC_DIALOGS_IN_OS2 0
// Define 1 to use generic dialogs in Windows, even though
// they duplicate native common dialog (e.g. wxColourDialog)
#endif
// _WX_SETUP_H_