assert if opening more than one find/replace dialog under the same parent -- this...

[wxWidgets.git] / src / motif / stattext.cpp

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 3f314856858bcad9592636cf0388059db5e477ef..ae9a674ac427a85b565c774717a42b3c8fc2f2bf 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "stattext.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -21,6 +17,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_STATTEXT
+

 #include "wx/stattext.h"
 
 #ifdef __VMS__
 #include "wx/stattext.h"
 
 #ifdef __VMS__


@@ -33,7 +32,7 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl);
+IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)

 
 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
 
 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,


@@ -51,18 +50,17 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     Widget borderWidget =
         (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
     wxXmString text( wxStripMenuCodes( label ) );
     Widget borderWidget =
         (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
     wxXmString text( wxStripMenuCodes( label ) );

-    WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));
-
-    m_labelWidget = XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),
-                                         xmLabelWidgetClass,
-                                         borderWidget ? borderWidget : parentWidget,
-                                         wxFont::GetFontTag(), fontType,
-                                         XmNlabelString, text(),
-                                         XmNalignment,
-                     ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END :
-                     ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER :
-                     XmALIGNMENT_BEGINNING)),
-                                         NULL);
+
+    m_labelWidget =
+        XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),
+            xmLabelWidgetClass,
+            borderWidget ? borderWidget : parentWidget,
+            wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay(parentWidget)),
+            XmNlabelString, text(),
+            XmNalignment, ((style & wxALIGN_RIGHT)  ? XmALIGNMENT_END :
+                          ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER :
+                                                      XmALIGNMENT_BEGINNING)),
+            NULL);

 
     m_mainWidget = borderWidget ? borderWidget : m_labelWidget;
 
 
     m_mainWidget = borderWidget ? borderWidget : m_labelWidget;
 


@@ -94,7 +92,7 @@ void wxStaticText::SetLabel(const wxString& label)
         XtVaSetValues(widget,
             XmNwidth, width,
             XmNheight, height,
         XtVaSetValues(widget,
             XmNwidth, width,
             XmNheight, height,

-            NULL);        
+            NULL);

         XtManageChild(widget);
     }
     else
         XtManageChild(widget);
     }
     else


@@ -105,3 +103,5 @@ void wxStaticText::SetLabel(const wxString& label)
             NULL);
     }
 }
             NULL);
     }
 }

+
+#endif // wxUSE_STATTEXT