Patch [ 726877 ]: Remove /GX- from makevc.env

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 0b6a7b731475fc857e22af88ef70135b1323c003..d8f2533de4fa76bf9ebd61a8965ba3cd8309aba7 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -36,6 +36,10 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

+#define WIDTH_OVERHEAD 48
+#define WIDTH_OVERHEAD_SUBTRACT 40
+#define HEIGHT_OVERHEAD 15
+

 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 
 void wxChoiceCallback (Widget w, XtPointer clientData,
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 
 void wxChoiceCallback (Widget w, XtPointer clientData,


@@ -75,6 +79,8 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
         XmNmarginWidth, 0,
         XmNpacking, XmPACK_TIGHT,
         XmNorientation, XmHORIZONTAL,
         XmNmarginWidth, 0,
         XmNpacking, XmPACK_TIGHT,
         XmNorientation, XmHORIZONTAL,

+        XmNresizeWidth, False,
+        XmNresizeHeight, False,

         NULL);
 
     XtVaSetValues ((Widget) m_formWidget, XmNspacing, 0, NULL);
         NULL);
 
     XtVaSetValues ((Widget) m_formWidget, XmNspacing, 0, NULL);


@@ -131,12 +137,11 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 
     ChangeFont(FALSE);
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 
     ChangeFont(FALSE);

+    ChangeBackgroundColour();

 
     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);
 

-    ChangeBackgroundColour();
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -174,14 +179,14 @@ int wxChoice::DoAppend(const wxString& item)
 #endif
         NULL);
 
 #endif
         NULL);
 

-    DoChangeBackgroundColour((WXWidget) w, m_backgroundColour);
+    wxDoChangeBackgroundColour((WXWidget) w, m_backgroundColour);

 
     if( m_font.Ok() )
         wxDoChangeFont( w, m_font );
 
     m_widgetArray.Add(w);
 
 
     if( m_font.Ok() )
         wxDoChangeFont( w, m_font );
 
     m_widgetArray.Add(w);
 

-    char mnem = wxFindMnemonic ((char*) (const char*) item);
+    char mnem = wxFindMnemonic (item);

     if (mnem != 0)
         XtVaSetValues (w, XmNmnemonic, mnem, NULL);
 
     if (mnem != 0)
         XtVaSetValues (w, XmNmnemonic, mnem, NULL);
 


@@ -359,7 +364,8 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (managed)
         XtUnmanageChild ((Widget) m_formWidget);
 
     if (managed)
         XtUnmanageChild ((Widget) m_formWidget);
 

-    int actualWidth = width, actualHeight = height;
+    int actualWidth = width - WIDTH_OVERHEAD_SUBTRACT,
+        actualHeight = height - HEIGHT_OVERHEAD;

 
     if (width > -1)
     {
 
     if (width > -1)
     {


@@ -373,11 +379,13 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     }
     if (height > -1)
     {
     }
     if (height > -1)
     {

+#if 0

         size_t i;
         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNheight, actualHeight,
                            NULL);
         size_t i;
         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNheight, actualHeight,
                            NULL);

+#endif

         XtVaSetValues ((Widget) m_buttonWidget, XmNheight, actualHeight,
             NULL);
     }
         XtVaSetValues ((Widget) m_buttonWidget, XmNheight, actualHeight,
             NULL);
     }


@@ -451,22 +459,22 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
 
 void wxChoice::ChangeBackgroundColour()
 {
 
 void wxChoice::ChangeBackgroundColour()
 {

-    DoChangeBackgroundColour(m_formWidget, m_backgroundColour);
-    DoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
-    DoChangeBackgroundColour(m_menuWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_formWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_menuWidget, m_backgroundColour);

     size_t i;
     for (i = 0; i < m_noStrings; i++)
     size_t i;
     for (i = 0; i < m_noStrings; i++)

-        DoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);
+        wxDoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);

 }
 
 void wxChoice::ChangeForegroundColour()
 {
 }
 
 void wxChoice::ChangeForegroundColour()
 {

-    DoChangeForegroundColour(m_formWidget, m_foregroundColour);
-    DoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
-    DoChangeForegroundColour(m_menuWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_formWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_menuWidget, m_foregroundColour);

     size_t i;
     for (i = 0; i < m_noStrings; i++)
     size_t i;
     for (i = 0; i < m_noStrings; i++)

-        DoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);
+        wxDoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);

 }
 
 int wxChoice::GetCount() const
 }
 
 int wxChoice::GetCount() const


@@ -523,6 +531,6 @@ wxSize wxChoice::DoGetBestSize() const
 {
     wxSize items = GetItemsSize();
     // FIXME arbitrary constants
 {
     wxSize items = GetItemsSize();
     // FIXME arbitrary constants

-    return wxSize( ( items.x ? items.x + 50 : 120 ),
-                     items.y + 15 );
+    return wxSize( ( items.x ? items.x + WIDTH_OVERHEAD : 120 ),
+                     items.y + HEIGHT_OVERHEAD );

 }
 }