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

1. wxChoice and wxComboBox support client data under MSW

Browse Source 
2. control creation streamlined under MSW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-07-26 23:02:32 +00:00
parent bae41ce192
commit 8d99be5f53
28 changed files with 614 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/common/wincmn.cpp
View File

@@ -100,9 +100,9 @@ void wxWindowBase::InitBase()
m_isShown = FALSE;
m_isEnabled = TRUE;
// no client data
m_clientObject = (wxClientData *)NULL;
// no client data (yet)
m_clientData = NULL;
m_clientDataType = ClientData_None;
// the default event handler is just this window
m_eventHandler = this;
@@ -154,6 +154,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
const wxPoint& WXUNUSED(pos),
const wxSize& WXUNUSED(size),
long style,
const wxValidator& validator,
const wxString& name)
{
// m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other
@@ -167,6 +168,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
SetName(name);
SetWindowStyleFlag(style);
SetParent(parent);
SetValidator(validator);
return TRUE;
}
@@ -1255,6 +1257,47 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt)
return pt2;
}
// ----------------------------------------------------------------------------
// client data
// ----------------------------------------------------------------------------
void wxWindowBase::DoSetClientObject( wxClientData *data )
{
wxASSERT_MSG( m_clientDataType != ClientData_Void,
_T("can't have both object and void client data") );
if ( m_clientObject )
delete m_clientObject;
m_clientObject = data;
m_clientDataType = ClientData_Object;
}
wxClientData *wxWindowBase::DoGetClientObject() const
{
wxASSERT_MSG( m_clientDataType == ClientData_Object,
_T("this window doesn't have object client data") );
return m_clientObject;
}
void wxWindowBase::DoSetClientData( void *data )
{
wxASSERT_MSG( m_clientDataType != ClientData_Object,
_T("can't have both object and void client data") );
m_clientData = data;
m_clientDataType = ClientData_Void;
}
void *wxWindowBase::DoGetClientData() const
{
wxASSERT_MSG( m_clientDataType == ClientData_Void,
_T("this window doesn't have void client data") );
return m_clientData;
}
// ----------------------------------------------------------------------------
// event handlers
// ----------------------------------------------------------------------------

4
src/gtk/control.cpp
View File

@@ -36,10 +36,6 @@ wxControl::wxControl( wxWindow *parent,
{
}
void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
{
}
void wxControl::SetLabel( const wxString &label )
{
m_label = _T("");

4
src/gtk1/control.cpp
View File

@@ -36,10 +36,6 @@ wxControl::wxControl( wxWindow *parent,
{
}
void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
{
}
void wxControl::SetLabel( const wxString &label )
{
m_label = _T("");

2
src/msw/button.cpp
View File

@@ -64,7 +64,7 @@ bool wxButton::Create(wxWindow *parent,
const wxValidator& validator,
const wxString& name)
{
if ( !CreateBase(parent, id, pos, size, style, name) )
if ( !CreateBase(parent, id, pos, size, style, validator, name) )
return FALSE;
SetValidator(validator);

350
src/msw/choice.cpp
View File

@@ -2,177 +2,153 @@
// Name: choice.cpp
// Purpose: wxChoice
// Author: Julian Smart
// Modified by:
// Modified by: Vadim Zeitlin to derive from wxChoiceBase
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#ifdef __GNUG__
#pragma implementation "choice.h"
#pragma implementation "choice.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/choice.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/choice.h"
#include "wx/utils.h"
#include "wx/log.h"
#endif
#include "wx/msw/private.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
#endif
bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
// ============================================================================
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
// creation
// ----------------------------------------------------------------------------
bool wxChoice::Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
int n, const wxString choices[],
long style,
const wxValidator& validator,
const wxString& name)
{
if (param == CBN_SELCHANGE)
{
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId);
event.SetInt(GetSelection());
event.SetEventObject(this);
event.SetString(GetStringSelection());
ProcessCommand(event);
if ( !CreateControl(parent, id, pos, size, style, validator, name) )
return FALSE;
long msStyle = WS_CHILD | CBS_DROPDOWNLIST | WS_TABSTOP | WS_VISIBLE;
if ( style & wxCB_SORT )
msStyle |= CBS_SORT;
// the experience shows that wxChoice vs. wxComboBox distinction confuses
// quite a few people - try to help them
wxASSERT_MSG( !(style & wxCB_DROPDOWN) &&
!(style & wxCB_READONLY) &&
!(style & wxCB_SIMPLE),
_T("this style flag is ignored by wxChoice, you "
"probably want to use a wxComboBox") );
if ( !MSWCreateControl(_T("COMBOBOX"), msStyle) )
return FALSE;
for ( int i = 0; i < n; i++ )
{
Append(choices[i]);
}
SetSize(pos.x, pos.y, size.x, size.y);
return TRUE;
}
else
return FALSE;
}
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
int n, const wxString choices[],
long style,
const wxValidator& validator,
const wxString& name)
// ----------------------------------------------------------------------------
// adding/deleting items to/from the list
// ----------------------------------------------------------------------------
void wxChoice::DoAppend(const wxString& item)
{
SetName(name);
SetValidator(validator);
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;
SetForegroundColour(parent->GetForegroundColour()) ;
m_noStrings = 0;
m_windowStyle = style;
if ( id == -1 )
m_windowId = (int)NewControlId();
else
m_windowId = id;
int x = pos.x;
int y = pos.y;
int width = size.x;
int height = size.y;
long msStyle = WS_CHILD | CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL
| WS_TABSTOP | WS_VISIBLE;
if (m_windowStyle & wxCB_SORT)
msStyle |= CBS_SORT;
bool want3D;
WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
// Even with extended styles, need to combine with WS_BORDER
// for them to look right.
if ( want3D || wxStyleHasBorder(m_windowStyle) )
msStyle |= WS_BORDER;
m_hWnd = (WXHWND)::CreateWindowEx(exStyle, _T("COMBOBOX"), NULL,
msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
wxGetInstance(), NULL);
wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create combobox") );
/*
#if wxUSE_CTL3D
if (want3D)
{
m_useCtl3D = TRUE;
Ctl3dSubclassCtl(wx_combo); // Does CTL3D affect the combobox? I think not.
}
#endif
*/
// Subclass again for purposes of dialog editing mode
SubclassWin(m_hWnd);
SetFont(parent->GetFont());
int i;
for (i = 0; i < n; i++)
{
Append(choices[i]);
}
SetSelection(n);
SetSize(x, y, width, height);
return TRUE;
}
void wxChoice::Append(const wxString& item)
{
SendMessage(GetHwnd(), CB_ADDSTRING, 0, (LONG)(const wxChar *)item);
m_noStrings ++;
SendMessage(GetHwnd(), CB_ADDSTRING, 0, (LONG)item.c_str());
}
void wxChoice::Delete(int n)
{
m_noStrings = (int)SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
wxCHECK_RET( n < GetCount(), _T("invalid item index in wxChoice::Delete") );
SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
}
void wxChoice::Clear(void)
void wxChoice::Clear()
{
SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0);
m_noStrings = 0;
SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0);
}
// ----------------------------------------------------------------------------
// selection
// ----------------------------------------------------------------------------
int wxChoice::GetSelection(void) const
int wxChoice::GetSelection() const
{
return (int)SendMessage(GetHwnd(), CB_GETCURSEL, 0, 0);
return (int)SendMessage(GetHwnd(), CB_GETCURSEL, 0, 0);
}
void wxChoice::SetSelection(int n)
{
SendMessage(GetHwnd(), CB_SETCURSEL, n, 0);
SendMessage(GetHwnd(), CB_SETCURSEL, n, 0);
}
// ----------------------------------------------------------------------------
// string list functions
// ----------------------------------------------------------------------------
int wxChoice::GetCount() const
{
return (int)SendMessage(GetHwnd(), CB_GETCOUNT, 0, 0);
}
int wxChoice::FindString(const wxString& s) const
{
#if defined(__WATCOMC__) && defined(__WIN386__)
// For some reason, Watcom in WIN386 mode crashes in the CB_FINDSTRINGEXACT message.
// Do it the long way instead.
char buf[512];
for (int i = 0; i < Number(); i++)
{
int len = (int)SendMessage(GetHwnd(), CB_GETLBTEXT, i, (LPARAM)(LPSTR)buf);
buf[len] = 0;
if (strcmp(buf, (const char *)s) == 0)
return i;
}
return -1;
#else
int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)(LPSTR)(const wxChar *)s);
if (pos == LB_ERR)
return -1;
else
return pos;
#endif
// For some reason, Watcom in WIN386 mode crashes in the CB_FINDSTRINGEXACT message.
// wxChoice::Do it the long way instead.
int count = GetCount();
for ( int i = 0; i < count; i++ )
{
// as CB_FINDSTRINGEXACT is case insensitive, be case insensitive too
if ( GetString(i).IsSameAs(s, FALSE) )
return i;
}
return wxNOT_FOUND;
#else // !Watcom
int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT,
(WPARAM)-1, (LPARAM)s.c_str());
return pos == LB_ERR ? wxNOT_FOUND : pos;
#endif // Watcom/!Watcom
}
wxString wxChoice::GetString(int n) const
@@ -190,6 +166,46 @@ wxString wxChoice::GetString(int n) const
return str;
}
// ----------------------------------------------------------------------------
// client data
// ----------------------------------------------------------------------------
void wxChoice::DoSetClientData( int n, void* clientData )
{
if ( SendMessage(GetHwnd(), CB_SETITEMDATA, n, (LPARAM)clientData) == CB_ERR )
{
wxLogLastError(_T("CB_SETITEMDATA"));
}
}
void* wxChoice::DoGetClientData( int n ) const
{
LPARAM rc = SendMessage(GetHwnd(), CB_GETITEMDATA, n, 0);
if ( rc == CB_ERR )
{
wxLogLastError(_T("CB_GETITEMDATA"));
// unfortunately, there is no way to return an error code to the user
rc = NULL;
}
return (void *)rc;
}
void wxChoice::DoSetClientObject( int n, wxClientData* clientData )
{
DoSetClientData(n, clientData);
}
wxClientData* wxChoice::DoGetClientObject( int n ) const
{
return (wxClientData *)DoGetClientData(n);
}
// ----------------------------------------------------------------------------
// wxMSW specific helpers
// ----------------------------------------------------------------------------
void wxChoice::DoSetSize(int x, int y,
int width, int height,
int sizeFlags)
@@ -207,7 +223,8 @@ wxSize wxChoice::DoGetBestSize()
// find the widest string
int wLine;
int wChoice = 0;
for ( int i = 0; i < m_noStrings; i++ )
int nItems = GetCount();
for ( int i = 0; i < nItems; i++ )
{
wxString str(GetString(i));
GetTextExtent(str, &wLine, NULL);
@@ -227,88 +244,45 @@ wxSize wxChoice::DoGetBestSize()
wChoice += 5*cx;
// Choice drop-down list depends on number of items (limited to 10)
size_t nStrings = m_noStrings == 0 ? 10 : wxMin(10, m_noStrings) + 1;
size_t nStrings = nItems == 0 ? 10 : wxMin(10, nItems) + 1;
int hChoice = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*nStrings;
return wxSize(wChoice, hChoice);
}
WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
return 0;
}
long wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
switch (nMsg)
if ( nMsg == WM_LBUTTONUP )
{
/*
case WM_GETDLGCODE:
{
if (GetWindowStyleFlag() & wxPROCESS_ENTER)
return DLGC_WANTALLKEYS;
break;
}
*/
/*
case WM_CHAR: // Always an ASCII character
{
if (wParam == VK_RETURN)
{
wxCommandEvent event(wxEVENT_TYPE_TEXT_ENTER_COMMAND);
event.commandString = ((wxTextCtrl *)item)->GetValue();
event.eventObject = item;
item->ProcessCommand(event);
return FALSE;
}
break;
}
*/
case WM_LBUTTONUP:
{
int x = (int)LOWORD(lParam);
int y = (int)HIWORD(lParam);
// Ok, this is truly weird, but if a panel with a wxChoice loses the
// focus, then you get a *fake* WM_LBUTTONUP message
// with x = 65535 and y = 65535.
// Filter out this nonsense.
if (x == 65535 && y == 65535)
return 0;
break;
}
// Ok, this is truly weird, but if a panel with a wxChoice loses the
// focus, then you get a *fake* WM_LBUTTONUP message with x = 65535 and
// y = 65535. Filter out this nonsense.
//
// VZ: I'd like to know how to reproduce this please...
if ( x == 65535 && y == 65535 )
return 0;
}
return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
}
wxString wxChoice::GetStringSelection (void) const
bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
int sel = GetSelection ();
if (sel > -1)
return wxString(this->GetString (sel));
else
return wxString(_T(""));
}
bool wxChoice::SetStringSelection (const wxString& s)
{
int sel = FindString (s);
if (sel > -1)
if ( param != CBN_SELCHANGE)
{
SetSelection (sel);
return TRUE;
// "selection changed" is the only event we're after
return FALSE;
}
else
return FALSE;
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId);
event.SetInt(GetSelection());
event.SetEventObject(this);
event.SetString(GetStringSelection());
ProcessCommand(event);
return TRUE;
}
void wxChoice::Command(wxCommandEvent & event)
{
SetSelection (event.GetInt());
ProcessCommand (event);
}

4
src/msw/combobox.cpp
View File

@@ -73,7 +73,6 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;
SetForegroundColour(parent->GetForegroundColour()) ;
m_noStrings = 0;
m_windowStyle = style;
@@ -87,8 +86,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
int width = size.x;
int height = size.y;
long msStyle = WS_CHILD | WS_HSCROLL | WS_VSCROLL |
WS_TABSTOP | WS_VISIBLE | CBS_NOINTEGRALHEIGHT;
long msStyle = WS_CHILD | WS_TABSTOP | WS_VISIBLE | CBS_NOINTEGRALHEIGHT;
if (m_windowStyle & wxCB_READONLY)
msStyle |= CBS_DROPDOWNLIST;

46
src/msw/control.cpp
View File

@@ -58,6 +58,39 @@ wxControl::~wxControl()
m_isBeingDeleted = TRUE;
}
bool wxControl::MSWCreateControl(const wxChar *classname, WXDWORD style)
{
m_hWnd = (WXHWND)::CreateWindowEx
(
GetExStyle(style), // extended style
classname, // the kind of control to create
NULL, // the window name
style, // the window style
0, 0, 0, 0, // the window position and size
GetHwndOf(GetParent()), // parent
(HMENU)GetId(), // child id
wxGetInstance(), // app instance
NULL // creation parameters
);
if ( !m_hWnd )
{
#ifdef __WXDEBUG__
wxLogError(_T("Failed to create a control of class '%s'"), classname);
#endif // DEBUG
return FALSE;
}
// subclass again for purposes of dialog editing mode
SubclassWin(m_hWnd);
// controls use the same font and colours as their parent dialog by default
InheritAttributes();
return TRUE;
}
wxSize wxControl::DoGetBestSize()
{
return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
@@ -147,6 +180,19 @@ void wxControl::OnEraseBackground(wxEraseEvent& event)
::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
}
WXDWORD wxControl::GetExStyle(WXDWORD& style) const
{
bool want3D;
WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
// Even with extended styles, need to combine with WS_BORDER
// for them to look right.
if ( want3D || wxStyleHasBorder(m_windowStyle) )
style |= WS_BORDER;
return exStyle;
}
// ---------------------------------------------------------------------------
// global functions
// ---------------------------------------------------------------------------

10
src/msw/makefile.b32
View File

@@ -1,6 +1,4 @@
# This file was automatically generated by tmake at 15:27, 1999/07/26
# This file was automatically generated by tmake at 00:42, 1999/07/27
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
#
@@ -108,8 +106,10 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
COMMONOBJS = \
$(MSWDIR)\y_tab.obj \
$(MSWDIR)\choiccmn.obj \
$(MSWDIR)\cmndata.obj \
$(MSWDIR)\config.obj \
$(MSWDIR)\ctrlcmn.obj \
$(MSWDIR)\date.obj \
$(MSWDIR)\datstrm.obj \
$(MSWDIR)\db.obj \
@@ -508,10 +508,14 @@ $(MSWDIR)\xpmhand.obj: $(MSWDIR)\xpmhand.$(SRCSUFF)
########################################################
# Common objects (always compiled)
$(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
$(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
$(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
$(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
$(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF)
$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)

8
src/msw/makefile.bcc
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 14:25, 1999/07/23
# This file was automatically generated by tmake at 00:42, 1999/07/27
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
#
@@ -99,8 +99,10 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
COMMONOBJS = \
$(MSWDIR)\y_tab.obj \
$(MSWDIR)\choiccmn.obj \
$(MSWDIR)\cmndata.obj \
$(MSWDIR)\config.obj \
$(MSWDIR)\ctrlcmn.obj \
$(MSWDIR)\date.obj \
$(MSWDIR)\datstrm.obj \
$(MSWDIR)\db.obj \
@@ -423,10 +425,14 @@ $(MSWDIR)\xpmhand.obj: $(MSWDIR)\xpmhand.$(SRCSUFF)
########################################################
# Common objects (always compiled)
$(MSWDIR)\choiccmn.obj: $(COMMDIR)\choiccmn.$(SRCSUFF)
$(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
$(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
$(MSWDIR)\ctrlcmn.obj: $(COMMDIR)\ctrlcmn.$(SRCSUFF)
$(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF)
$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)

14
src/msw/makefile.dos
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 14:25, 1999/07/23
# This file was automatically generated by tmake at 00:42, 1999/07/27
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
#
@@ -86,8 +86,10 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
COMMONOBJS = \
$(COMMDIR)\y_tab.obj \
$(COMMDIR)\choiccmn.obj \
$(COMMDIR)\cmndata.obj \
$(COMMDIR)\config.obj \
$(COMMDIR)\ctrlcmn.obj \
$(COMMDIR)\date.obj \
$(COMMDIR)\datstrm.obj \
$(COMMDIR)\db.obj \
@@ -664,6 +666,11 @@ $(MSWDIR)/xpmhand.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(COMMDIR)/choiccmn.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(COMMDIR)/cmndata.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -674,6 +681,11 @@ $(COMMDIR)/config.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(COMMDIR)/ctrlcmn.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(COMMDIR)/date.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

4
src/msw/makefile.g95
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 14:25, 1999/07/23
# This file was automatically generated by tmake at 00:42, 1999/07/27
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
#
@@ -59,8 +59,10 @@ GENERICOBJS = \
COMMONOBJS = \
$(COMMDIR)/y_tab.$(OBJSUFF) \
$(COMMDIR)/choiccmn.$(OBJSUFF) \
$(COMMDIR)/cmndata.$(OBJSUFF) \
$(COMMDIR)/config.$(OBJSUFF) \
$(COMMDIR)/ctrlcmn.$(OBJSUFF) \
$(COMMDIR)/date.$(OBJSUFF) \
$(COMMDIR)/datstrm.$(OBJSUFF) \
$(COMMDIR)/db.$(OBJSUFF) \

4
src/msw/makefile.sc
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 14:25, 1999/07/23
# This file was automatically generated by tmake at 00:42, 1999/07/27
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
# Symantec C++ makefile for the msw objects
@@ -47,8 +47,10 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
COMMONOBJS = \
$(COMMDIR)\y_tab.obj \
$(COMMDIR)\choiccmn.obj \
$(COMMDIR)\cmndata.obj \
$(COMMDIR)\config.obj \
$(COMMDIR)\ctrlcmn.obj \
$(COMMDIR)\date.obj \
$(COMMDIR)\datstrm.obj \
$(COMMDIR)\db.obj \

4
src/msw/makefile.vc
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 14:25, 1999/07/23
# This file was automatically generated by tmake at 00:42, 1999/07/27
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc
@@ -113,8 +113,10 @@ NONESSENTIALOBJS= ..\generic\$D\colrdlgg.obj \
COMMONOBJS = \
..\common\$D\y_tab.obj \
..\common\$D\choiccmn.obj \
..\common\$D\cmndata.obj \
..\common\$D\config.obj \
..\common\$D\ctrlcmn.obj \
..\common\$D\date.obj \
..\common\$D\datstrm.obj \
..\common\$D\db.obj \

10
src/msw/makefile.wat
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 14:25, 1999/07/23
# This file was automatically generated by tmake at 00:42, 1999/07/27
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
#!/binb/wmake.exe
@@ -67,8 +67,10 @@ NONESSENTIALOBJS= colrdlgg.obj &
COMMONOBJS = &
y_tab.obj &
choiccmn.obj &
cmndata.obj &
config.obj &
ctrlcmn.obj &
date.obj &
datstrm.obj &
db.obj &
@@ -531,12 +533,18 @@ xpmhand.obj: $(MSWDIR)\xpmhand.cpp
########################################################
# Common objects (always compiled)
choiccmn.obj: $(COMMDIR)\choiccmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
cmndata.obj: $(COMMDIR)\cmndata.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
config.obj: $(COMMDIR)\config.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
ctrlcmn.obj: $(COMMDIR)\ctrlcmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
date.obj: $(COMMDIR)\date.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<

3
src/msw/notebook.cpp
View File

@@ -122,7 +122,8 @@ bool wxNotebook::Create(wxWindow *parent,
const wxString& name)
{
// base init
CreateBase(parent, id, pos, size, style, name);
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
// colors and font
m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));

2
src/msw/statline.cpp
View File

@@ -51,7 +51,7 @@ bool wxStaticLine::Create( wxWindow *parent,
long style,
const wxString &name)
{
if ( !CreateBase(parent, id, pos, size, style, name) )
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
parent->AddChild(this);

2
src/msw/textctrl.cpp
View File

@@ -112,7 +112,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
const wxString& name)
{
// base initialization
if ( !CreateBase(parent, id, pos, size, style, name) )
if ( !CreateBase(parent, id, pos, size, style, validator, name) )
return FALSE;
SetValidator(validator);

6
src/msw/window.cpp
View File

@@ -297,7 +297,8 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
{
wxCHECK_MSG( parent, FALSE, _T("can't create wxWindow without parent") );
CreateBase(parent, id, pos, size, style, name);
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
parent->AddChild(this);
@@ -856,7 +857,8 @@ WXDWORD wxWindow::MakeExtendedStyle(long style, bool eliminateBorders)
// Determines whether native 3D effects or CTL3D should be used,
// applying a default border style if required, and returning an extended
// style to pass to CreateWindowEx.
WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D)
WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle,
bool *want3D) const
{
// If matches certain criteria, then assume no 3D effects
// unless specifically requested (dealt with in MakeExtendedStyle)