projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cvs to svn
[wxWidgets.git]
/
src
/
motif
/
choice.cpp
diff --git
a/src/motif/choice.cpp
b/src/motif/choice.cpp
index ba418a03e99f014d846ff7100ea802de8453f7bb..6c7edaa11773972e698dd15ba541d0dde33f6a2a 100644
(file)
--- a/
src/motif/choice.cpp
+++ b/
src/motif/choice.cpp
@@
-23,10
+23,9
@@
#ifndef WX_PRECOMP
#include "wx/utils.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
+ #include "wx/arrstr.h"
#endif
#endif
-#include "wx/arrstr.h"
-
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#ifdef __VMS__
#pragma message disable nosimpint
#endif
@@
-72,6
+71,7
@@
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
{
if ( !CreateControl(parent, id, pos, size, style, validator, name) )
return false;
{
if ( !CreateControl(parent, id, pos, size, style, validator, name) )
return false;
+ PreCreation();
Widget parentWidget = (Widget) parent->GetClientWidget();
Widget parentWidget = (Widget) parent->GetClientWidget();
@@
-139,9
+139,7
@@
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
- ChangeFont(false);
- ChangeBackgroundColour();
-
+ PostCreation();
AttachWidget (parent, m_buttonWidget, m_formWidget,
pos.x, pos.y, bestSize.x, bestSize.y);
AttachWidget (parent, m_buttonWidget, m_formWidget,
pos.x, pos.y, bestSize.x, bestSize.y);
@@
-196,7
+194,7
@@
int wxChoice::DoInsert(const wxString& item, unsigned int pos)
#ifndef XmNpositionIndex
wxCHECK_MSG( pos == GetCount(), -1, wxT("insert not implemented"));
#endif
#ifndef XmNpositionIndex
wxCHECK_MSG( pos == GetCount(), -1, wxT("insert not implemented"));
#endif
- Widget w = XtVaCreateManagedWidget (
wxStripMenuCodes
(item),
+ Widget w = XtVaCreateManagedWidget (
GetLabelText
(item),
#if wxUSE_GADGETS
xmPushButtonGadgetClass, (Widget) m_menuWidget,
#else
#if wxUSE_GADGETS
xmPushButtonGadgetClass, (Widget) m_menuWidget,
#else
@@
-451,7
+449,7
@@
void wxChoice::ChangeFont(bool keepOriginalSize)
// Note that this causes the widget to be resized back
// to its original size! We therefore have to set the size
// back again. TODO: a better way in Motif?
// Note that this causes the widget to be resized back
// to its original size! We therefore have to set the size
// back again. TODO: a better way in Motif?
- if (m_font.Ok())
+ if (m_
mainWidget && m_
font.Ok())
{
Display* dpy = XtDisplay((Widget) m_mainWidget);
int width, height, width1, height1;
{
Display* dpy = XtDisplay((Widget) m_mainWidget);
int width, height, width1, height1;