Smartphone adjustements to generic log dialog.

[wxWidgets.git] / src / msw / wince / choicece.cpp

diff --git a/src/msw/wince/choicece.cpp b/src/msw/wince/choicece.cpp
index 59971875c4f41e92a81e9ce93a69ea0669425fbe..231b96e90f9da40e31c8d0a348176352b570aabf 100644 (file)
--- a/src/msw/wince/choicece.cpp
+++ b/src/msw/wince/choicece.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/wince/choicece.cpp
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/wince/choicece.cpp

-// Purpose:     wxChoice implementation for Smartphones
+// Purpose:     wxChoice implementation for smart phones driven by WinCE

 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     29.07.2004
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     29.07.2004


@@ -39,7 +39,7 @@
 #include "wx/msw/missing.h"
 #include "wx/msw/winundef.h"
 
 #include "wx/msw/missing.h"
 #include "wx/msw/winundef.h"
 

-#if wxUSE_CHOICE && defined(__SMARTPHONE__)
+#if wxUSE_CHOICE && defined(__SMARTPHONE__) && defined(__WXWINCE__)

 
 #if wxUSE_EXTENDED_RTTI
 // TODO
 
 #if wxUSE_EXTENDED_RTTI
 // TODO


@@ -149,7 +149,7 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
     WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ;
 
     wxSize sizeText(size), sizeBtn(size);
     WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ;
 
     wxSize sizeText(size), sizeBtn(size);

-    sizeBtn.x = GetBestSpinerSize(IsVertical(style)).x;
+    sizeBtn.x = GetBestSpinnerSize(IsVertical(style)).x;

 
     if ( sizeText.x == wxDefaultCoord )
     {
 
     if ( sizeText.x == wxDefaultCoord )
     {


@@ -478,7 +478,7 @@ wxClientData* wxChoice::DoGetItemClientObject( int n ) const
 
 wxSize wxChoice::DoGetBestSize() const
 {
 
 wxSize wxChoice::DoGetBestSize() const
 {

-    wxSize sizeBtn = GetBestSpinerSize(IsVertical(GetWindowStyle()));
+    wxSize sizeBtn = GetBestSpinnerSize(IsVertical(GetWindowStyle()));

     sizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN;
 
     int y;
     sizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN;
 
     int y;


@@ -501,7 +501,7 @@ wxSize wxChoice::DoGetBestSize() const
 
 void wxChoice::DoMoveWindow(int x, int y, int width, int height)
 {
 
 void wxChoice::DoMoveWindow(int x, int y, int width, int height)
 {

-    int widthBtn = GetBestSpinerSize(IsVertical(GetWindowStyle())).x;
+    int widthBtn = GetBestSpinnerSize(IsVertical(GetWindowStyle())).x;

     int widthText = width - widthBtn - MARGIN_BETWEEN;
     if ( widthText <= 0 )
     {
     int widthText = width - widthBtn - MARGIN_BETWEEN;
     if ( widthText <= 0 )
     {


@@ -545,4 +545,4 @@ void wxChoice::DoGetPosition(int *x, int *y) const
     wxConstCast(this, wxChoice)->m_hWnd = hWnd;
 }
 
     wxConstCast(this, wxChoice)->m_hWnd = hWnd;
 }
 

-#endif // wxUSE_CHOICE && __SMARTPHONE__
+#endif // wxUSE_CHOICE && __SMARTPHONE__ && __WXWINCE__