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

OS/2 PM Fixeups for fonts, validators, and html

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-11-08 05:20:31 +00:00
parent 57c4d796c5
commit 5d4b632ba3
25 changed files with 227 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/ctrlcmn.cpp
View File

@@ -42,7 +42,13 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
const wxPoint& pos,
const wxSize& size,
long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
// even if it's possible to create controls without parents in some port,

2
src/common/validate.cpp
View File

@@ -36,7 +36,7 @@
// treated as a static global class by VA and thus cannot use in this form.
// Defined as a pointer and then explicity allocated and deallocated
// by user if desired
const wxValidator* wxDefaultValidator;
const wxValidator* wxDefaultValidator = NULL;
#else
const wxValidator wxDefaultValidator;
#endif

19
src/common/wincmn.cpp
View File

@@ -154,7 +154,13 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
const wxPoint& WXUNUSED(pos),
const wxSize& WXUNUSED(size),
long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
// m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other
@@ -589,6 +595,18 @@ void wxWindowBase::SetCaret(wxCaret *caret)
// validators
// ----------------------------------------------------------------------------
# if defined(__VISAGECPP__)
void wxWindowBase::SetValidator(const wxValidator* validator)
{
if ( m_windowValidator )
delete m_windowValidator;
m_windowValidator = (wxValidator *)validator->Clone();
if ( m_windowValidator )
m_windowValidator->SetWindow(this) ;
}
# else
void wxWindowBase::SetValidator(const wxValidator& validator)
{
if ( m_windowValidator )
@@ -599,6 +617,7 @@ void wxWindowBase::SetValidator(const wxValidator& validator)
if ( m_windowValidator )
m_windowValidator->SetWindow(this) ;
}
# endif // __VISAGECPP__
#endif // wxUSE_VALIDATORS
// ----------------------------------------------------------------------------

12
src/generic/listctrl.cpp
View File

@@ -956,7 +956,13 @@ END_EVENT_TABLE()
wxListTextCtrl::wxListTextCtrl( wxWindow *parent, const wxWindowID id,
bool *accept, wxString *res, wxListMainWindow *owner,
const wxString &value, const wxPoint &pos, const wxSize &size,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
int style, const wxValidator* validator, const wxString &name ) :
# else
int style, const wxValidator& validator, const wxString &name ) :
# endif
#endif
wxTextCtrl( parent, id, value, pos, size, style, validator, name )
{
m_res = res;
@@ -2497,7 +2503,13 @@ wxListCtrl::~wxListCtrl()
bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
long style, const wxValidator *validator,
# else
long style, const wxValidator &validator,
# endif
#endif
const wxString &name )
{
m_imageListNormal = (wxImageList *) NULL;

12
src/generic/treectrl.cpp
View File

@@ -196,7 +196,13 @@ END_EVENT_TABLE()
wxTreeTextCtrl::wxTreeTextCtrl( wxWindow *parent, const wxWindowID id,
bool *accept, wxString *res, wxTreeCtrl *owner,
const wxString &value, const wxPoint &pos, const wxSize &size,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
int style, const wxValidator* validator, const wxString &name ) :
# else
int style, const wxValidator& validator, const wxString &name ) :
# endif
#endif
wxTextCtrl( parent, id, value, pos, size, style, validator, name )
{
m_res = res;
@@ -522,7 +528,13 @@ void wxTreeCtrl::Init()
bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator *validator,
# else
const wxValidator &validator,
# endif
#endif
const wxString& name )
{
Init();

10
src/html/helpfrm.cpp
View File

@@ -142,6 +142,14 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h));
#if defined(__WXMSW__) || (__WXPM__)
wxIcon frameIcon("wxhelp", wxBITMAP_TYPE_ICO_RESOURCE, 32, 32);
#else
wxIcon frameIcon(help_xpm);
#endif
if (frameIcon.Ok())
SetIcon(frameIcon);
GetPosition(&m_Cfg.x, &m_Cfg.y);
SetIcon(wxICON(help));
@@ -157,7 +165,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
toolBar -> SetMargins(2, 2);
wxBitmap* toolBarBitmaps[3];
#ifdef __WXMSW__
#if defined(__WXMSW__) || (__WXPM__)
toolBarBitmaps[0] = new wxBitmap("panel");
toolBarBitmaps[1] = new wxBitmap("back");
toolBarBitmaps[2] = new wxBitmap("forward");

2
src/makelib.vc
View File

@@ -10,7 +10,7 @@
# info
# Set WXDIR for your system
WXDIR = $(WXWIN)
WXDIR = j:\dev\wx2\wxWindows
!include $(WXDIR)\src\makevc.env

11
src/makeprog.vc
View File

@@ -11,13 +11,13 @@
# info
# Set WXDIR for your system
WXDIR = $(WXWIN)
WXDIR = j:\dev\wx2\wxWindows
WXUSINGDLL=0
!include $(WXDIR)\src\makevc.env
all: $(PROGRAM).exe $(EXTRATARGETS)
all: $(PROGRAM).exe
wx:
cd $(WXDIR)\src\msw
@@ -29,17 +29,14 @@ wxclean:
nmake -f makefile.vc clean
# cd $(THISDIR)
$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS)
$(link) @<<
-out:$(PROGRAM).exe
$(LINKFLAGS)
$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res
$(DUMMYOBJ) $(OBJECTS)
$(LIBS)
<<
$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
$(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
clean:
-erase $(OBJECTS)
-erase *.exe

2
src/makevc.env
View File

@@ -43,7 +43,7 @@ WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib sh
comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2
# Change this to your WXWIN directory
WXDIR=$(WXWIN)
WXDIR=j:\dev\wx2\wxWindows
WXSRC=$(WXDIR)\src\msw
WXINC=$(WXDIR)\include

8
src/os2/bmpbuttn.cpp
View File

@@ -28,12 +28,20 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
const wxPoint& pos,
const wxSize& size, long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
m_buttonBitmap = bitmap;
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
parent->AddChild(this);

8
src/os2/button.cpp
View File

@@ -32,11 +32,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
const wxSize& size, long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
m_windowStyle = style;
parent->AddChild((wxButton *)this);

16
src/os2/checkbox.cpp
View File

@@ -49,11 +49,19 @@ bool wxCheckBox::OS2Command(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos,
const wxSize& size, long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;
@@ -176,11 +184,19 @@ void wxCheckBox::Command (wxCommandEvent & event)
bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
const wxPoint& pos,
const wxSize& size, long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;

6
src/os2/checklst.cpp
View File

@@ -259,7 +259,13 @@ wxCheckListBox::wxCheckListBox() : wxListBox()
wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
int nStrings, const wxString choices[],
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
long style, const wxValidator* val,
# else
long style, const wxValidator& val,
# endif
#endif
const wxString& name)
: wxListBox()
{

6
src/os2/choice.cpp
View File

@@ -30,7 +30,13 @@ bool wxChoice::Create(wxWindow *parent,
const wxSize& size,
int n, const wxString choices[],
long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
if ( !CreateControl(parent, id, pos, size, style, validator, name) )

8
src/os2/combobox.cpp
View File

@@ -63,11 +63,19 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
const wxSize& size,
int n, const wxString choices[],
long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;
SetForegroundColour(parent->GetForegroundColour()) ;

8
src/os2/gauge.cpp
View File

@@ -57,7 +57,13 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
static bool wxGaugeOS2Initialised = FALSE;
@@ -73,7 +79,9 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
}
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
if (parent) parent->AddChild(this);
m_rangeMax = range;
m_gaugePos = 0;

8
src/os2/listbox.cpp
View File

@@ -80,7 +80,13 @@ bool wxListBox::Create(wxWindow *parent,
const wxSize& size,
int n, const wxString choices[],
long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
m_noItems = 0;
@@ -88,7 +94,9 @@ bool wxListBox::Create(wxWindow *parent,
m_selected = 0;
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
if (parent)
parent->AddChild(this);

9
src/os2/radiobox.cpp
View File

@@ -143,14 +143,21 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size,
int n, const wxString choices[],
int majorDim, long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* val, const wxString& name)
# else
const wxValidator& val, const wxString& name)
# endif
#endif
{
m_selectedButton = -1;
m_noItems = n;
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(val);
#endif
parent->AddChild(this);
m_backgroundColour = parent->GetBackgroundColour();
m_foregroundColour = parent->GetForegroundColour();

16
src/os2/radiobut.cpp
View File

@@ -46,11 +46,19 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos,
const wxSize& size, long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
if (parent) parent->AddChild(this);
@@ -150,11 +158,19 @@ bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id,
const wxBitmap *bitmap,
const wxPoint& pos,
const wxSize& size, long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour());

8
src/os2/scrolbar.cpp
View File

@@ -35,14 +35,22 @@ END_EVENT_TABLE()
bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size, long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
if (!parent)
return FALSE;
parent->AddChild(this);
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
SetBackgroundColour(parent->GetBackgroundColour()) ;
SetForegroundColour(parent->GetForegroundColour()) ;

8
src/os2/slider.cpp
View File

@@ -46,11 +46,19 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue,
const wxPoint& pos,
const wxSize& size, long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
if (parent) parent->AddChild(this);

6
src/os2/textctrl.cpp
View File

@@ -87,7 +87,13 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
#if wxUSE_VALIDATORS
# if defined(__VISAGECPP__)
const wxValidator* validator,
# else
const wxValidator& validator,
# endif
#endif
const wxString& name)
{
// base initialization

31
src/os2/thread.cpp
View File

@@ -100,8 +100,7 @@ wxMutex::~wxMutex()
if (m_locked > 0)
wxLogDebug(wxT("Warning: freeing a locked mutex (%d locks)."), m_locked);
::DosCloseMutexSem(p_internal->m_vMutex);
delete p_internal;
p_internal = NULL;
p_internal->m_vMutex = NULL;
}
wxMutexError wxMutex::Lock()
@@ -244,6 +243,34 @@ void wxCondition::Broadcast()
// wxCriticalSection implementation
// ----------------------------------------------------------------------------
class wxCriticalSectionInternal
{
public:
// init the critical section object
wxCriticalSectionInternal()
{ }
// free the associated ressources
~wxCriticalSectionInternal()
{ }
private:
};
// ----------------------------------------------------------------------------
// wxCriticalSection implementation
// ----------------------------------------------------------------------------
wxCriticalSection::wxCriticalSection()
{
m_critsect = new wxCriticalSectionInternal;
}
wxCriticalSection::~wxCriticalSection()
{
delete m_critsect;
}
void wxCriticalSection::Enter()
{
::DosEnterCritSec();

23
src/os2/utils.cpp
View File

@@ -195,10 +195,9 @@ bool wxShell(
}
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
long wxGetFreeMemory(
void* pMemptr
)
long wxGetFreeMemory()
{
void* pMemptr;
ULONG lSize;
ULONG lMemFlags;
APIRET rc;
@@ -309,14 +308,17 @@ int wxGetOsVersion(
)
{
ULONG ulSysInfo[QSV_MAX] = {0};
APIRET ulrc;
if (::DosQuerySysInfo( 1L
ulrc = ::DosQuerySysInfo( 1L
,QSV_MAX
,(PVOID)ulSysInfo
,sizeof(ULONG) * QSV_MAX
))
);
if (ulrc == 0L)
{
*pMajorVsn = ulSysInfo[QSV_VERSION_MAJOR];
*pMajorVsn = *pMajorVsn/10;
*pMinorVsn = ulSysInfo[QSV_VERSION_MINOR];
return wxWINDOWS_OS2;
}
@@ -427,10 +429,10 @@ bool wxGetResource(
,(PSZ)WXSTRINGCAST rSection
,(PSZ)WXSTRINGCAST rEntry
,(PSZ)zDefunkt
,(void*)wxBuffer
,(void*)*ppValue
,1000
);
if (n == 0L || wxStrcmp(wxBuffer, zDefunkt) == 0)
if (n != 0L || wxStrcmp(*ppValue, zDefunkt) == 0)
return FALSE;
}
else
@@ -442,15 +444,12 @@ bool wxGetResource(
,(PSZ)WXSTRINGCAST rSection
,(PSZ)WXSTRINGCAST rEntry
,(PSZ)zDefunkt
,(void*)wxBuffer
,(void*)*ppValue
,1000
);
if (n == 0L || wxStrcmp(wxBuffer, zDefunkt) == 0)
if (n != 0L || wxStrcmp(*ppValue, zDefunkt) == 0)
return FALSE;
}
if (*ppValue)
delete[] (*ppValue);
*ppValue = copystring(wxBuffer);
return TRUE;
}

2
src/zlib/MAKEFILE.VA
View File

@@ -19,7 +19,7 @@ OS2LIBFLAGS=/NOL /NOE
OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
# Change WXDIR or WXWIN to wherever wxWindows is found
WXDIR = h:\dev\wx2\wxWindows
WXDIR = j:\dev\wx2\wxWindows
OS2ZLIBDIR=$(WXDIR)\src\zlib
OS2ZLIBINC=$(WINPNGDIR)