Removed references to DEBUG and WXDEBUG; cured Motif font problem; removed

some warnings in OGL; fixed bug in wxChoice


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-11-09 11:57:05 +00:00
parent 605c9c8318
commit ea57084d10
47 changed files with 205 additions and 321 deletions

View File

@@ -50,7 +50,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
{
SetName(name);
SetValidator(validator);
m_noStrings = n;
m_noStrings = 0; // Starts off with none, incremented in Append
m_windowStyle = style;
m_buttonWidget = (WXWidget) 0;
m_menuWidget = (WXWidget) 0;
@@ -66,6 +66,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
m_backgroundColour = parent->GetBackgroundColour();
m_foregroundColour = parent->GetForegroundColour();
m_windowFont = parent->GetFont();
Widget parentWidget = (Widget) parent->GetClientWidget();
@@ -125,7 +126,6 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
m_windowFont = parent->GetFont();
ChangeFont(FALSE);
AttachWidget (parent, m_buttonWidget, m_formWidget, pos.x, pos.y, size.x, size.y);