Applied patch [ 1374215 ] Bug fix to wxSpinCtrl for Windows

[wxWidgets.git] / src / msw / dialog.cpp

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index d1f46b4b371d142d6ff86b7c112527a1d3a4bb0b..ecac0fae545551781f121194f0d79517b463d967 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dialog.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"
 


@@ -33,6 +29,7 @@
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/app.h"

+    #include "wx/button.h"

     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"


@@ -43,8 +40,14 @@
 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 
 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 

-#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
-    #include <commdlg.h>
+#include "wx/msw/wrapcdlg.h"
+
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+    #include "wx/msw/wince/resources.h"
+#endif // __SMARTPHONE__ && __WXWINCE__
+
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+#include "wx/toolbar.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -63,7 +66,7 @@ wxBEGIN_FLAGS( wxDialogStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)

-    
+

     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)


@@ -77,9 +80,6 @@ wxBEGIN_FLAGS( wxDialogStyle )
     wxFLAGS_MEMBER(wxCLIP_CHILDREN)
 
     // dialog styles
     wxFLAGS_MEMBER(wxCLIP_CHILDREN)
 
     // dialog styles

-    wxFLAGS_MEMBER(wxDIALOG_MODAL)
-    wxFLAGS_MEMBER(wxDIALOG_MODELESS)
-    wxFLAGS_MEMBER(wxNO_3D)

     wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
     wxFLAGS_MEMBER(wxSTAY_ON_TOP)
     wxFLAGS_MEMBER(wxCAPTION)
     wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
     wxFLAGS_MEMBER(wxSTAY_ON_TOP)
     wxFLAGS_MEMBER(wxCAPTION)


@@ -95,14 +95,14 @@ wxEND_FLAGS( wxDialogStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow,"wx/dialog.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxDialog)
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow,"wx/dialog.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxDialog)

-    wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style

 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxDialog)
 wxEND_HANDLERS_TABLE()
 
 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxDialog)
 wxEND_HANDLERS_TABLE()
 

-wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle) 
+wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)

 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)


@@ -143,7 +143,7 @@ private:
     wxModalEventLoop m_evtLoop;
 };
 
     wxModalEventLoop m_evtLoop;
 };
 

-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -156,9 +156,12 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
 void wxDialog::Init()
 {
     m_oldFocus = (wxWindow *)NULL;
 void wxDialog::Init()
 {
     m_oldFocus = (wxWindow *)NULL;

-    m_isShown = FALSE;
+    m_isShown = false;

     m_modalData = NULL;
     m_modalData = NULL;

-    m_endModalCalled = FALSE;
+    m_endModalCalled = false;
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+    m_dialogToolBar = NULL;
+#endif

 }
 
 bool wxDialog::Create(wxWindow *parent,
 }
 
 bool wxDialog::Create(wxWindow *parent,


@@ -178,52 +181,57 @@ bool wxDialog::Create(wxWindow *parent,
     style |= wxTAB_TRAVERSAL;
 
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
     style |= wxTAB_TRAVERSAL;
 
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )

-        return FALSE;
+        return false;

 
     if ( !m_hasFont )
         SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
 
     if ( !m_hasFont )
         SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 

-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+    SetLeftMenu(wxID_OK, _("OK"));
+#endif
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+    CreateToolBar();
+#endif

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

-void wxDialog::SetModal(bool flag)
+// deprecated ctor
+wxDialog::wxDialog(wxWindow *parent,
+                   const wxString& title,
+                   bool WXUNUSED(modal),
+                   int x,
+                   int y,
+                   int w,
+                   int h,
+                   long style,
+                   const wxString& name)

 {
 {

-    if ( flag )
-    {
-        m_windowStyle |= wxDIALOG_MODAL;
+    Init();

 
 

-        wxModelessWindows.DeleteObject(this);
-    }
-    else
-    {
-        m_windowStyle &= ~wxDIALOG_MODAL;
+    Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
+}

 
 

-        wxModelessWindows.Append(this);
-    }
+void wxDialog::SetModal(bool WXUNUSED(flag))
+{
+    // nothing to do, obsolete method

 }
 
 wxDialog::~wxDialog()
 {
 }
 
 wxDialog::~wxDialog()
 {

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

 
     // this will also reenable all the other windows for a modal dialog
 
     // this will also reenable all the other windows for a modal dialog

-    Show(FALSE);
+    Show(false);

 }
 
 // ----------------------------------------------------------------------------
 // showing the dialogs
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // showing the dialogs
 // ----------------------------------------------------------------------------
 

-bool wxDialog::IsModal() const
-{
-    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
-}
-

 bool wxDialog::IsModalShowing() const
 {
 bool wxDialog::IsModalShowing() const
 {

-    return m_modalData != NULL;
+    return IsModal();

 }
 
 wxWindow *wxDialog::FindSuitableParent() const
 }
 
 wxWindow *wxDialog::FindSuitableParent() const


@@ -248,51 +256,11 @@ wxWindow *wxDialog::FindSuitableParent() const
     return parent;
 }
 
     return parent;
 }
 

-void wxDialog::DoShowModal()
-{
-    wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
-    wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );
-
-    wxWindow *parent = GetParent();
-
-    wxWindow* oldFocus = m_oldFocus;
-
-    // We have to remember the HWND because we need to check
-    // the HWND still exists (oldFocus can be garbage when the dialog
-    // exits, if it has been destroyed)
-    HWND hwndOldFocus = 0;
-    if (oldFocus)
-        hwndOldFocus = (HWND) oldFocus->GetHWND();
-
-    // remember where the focus was
-    if ( !oldFocus )
-    {
-        oldFocus = parent;
-        if ( parent )
-            hwndOldFocus = GetHwndOf(parent);
-    }
-
-    // enter the modal loop
-    {
-        wxDialogModalDataTiedPtr modalData(&m_modalData,
-                                           new wxDialogModalData(this));
-        modalData->RunLoop();
-    }
-
-    // and restore focus
-    // Note that this code MUST NOT access the dialog object's data
-    // in case the object has been deleted (which will be the case
-    // for a modal dialog that has been destroyed before calling EndModal).
-    if ( oldFocus && (oldFocus != this) && ::IsWindow(hwndOldFocus))
-    {
-        // This is likely to prove that the object still exists
-        if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
-            oldFocus->SetFocus();
-    }
-}
-

 bool wxDialog::Show(bool show)
 {
 bool wxDialog::Show(bool show)
 {

+    if ( show == IsShown() )
+        return false;
+

     if ( !show && m_modalData )
     {
         // we need to do this before calling wxDialogBase version because if we
     if ( !show && m_modalData )
     {
         // we need to do this before calling wxDialogBase version because if we


@@ -303,13 +271,16 @@ bool wxDialog::Show(bool show)
         m_modalData->ExitLoop();
     }
 
         m_modalData->ExitLoop();
     }
 

-    // ShowModal() may be called for already shown dialog
-    if ( !wxDialogBase::Show(show) && !(show && IsModal()) )
+    if ( show )

     {
     {

-        // nothing to do
-        return FALSE;
+        // this usually will result in TransferDataToWindow() being called
+        // which will change the controls values so do it before showing as
+        // otherwise we could have some flicker
+        InitDialog();

     }
 
     }
 

+    wxDialogBase::Show(show);
+

     if ( show )
     {
         // dialogs don't get WM_SIZE message after creation unlike most (all?)
     if ( show )
     {
         // dialogs don't get WM_SIZE message after creation unlike most (all?)


@@ -319,26 +290,9 @@ bool wxDialog::Show(bool show)
         // NB: normally we should call it just the first time but doing it
         //     every time is simpler than keeping a flag
         Layout();
         // NB: normally we should call it just the first time but doing it
         //     every time is simpler than keeping a flag
         Layout();

-
-        // this usually will result in TransferDataToWindow() being called
-        InitDialog();

     }
 
     }
 

-    // EndModal may have been called from InitDialog handler,
-    // which would cause an infinite loop if we didn't take it
-    // into account
-    if ( show && IsModal() && !m_endModalCalled )
-    {
-        // modal dialog needs a parent window, so try to find one
-        if ( !GetParent() )
-        {
-            m_parent = FindSuitableParent();
-        }
-
-        DoShowModal();
-    }
-
-    return TRUE;
+    return true;

 }
 
 void wxDialog::Raise()
 }
 
 void wxDialog::Raise()


@@ -346,40 +300,103 @@ void wxDialog::Raise()
     ::SetForegroundWindow(GetHwnd());
 }
 
     ::SetForegroundWindow(GetHwnd());
 }
 

-// a special version for Show(TRUE) for modal dialogs which returns return code
+// show dialog modally

 int wxDialog::ShowModal()
 {
 int wxDialog::ShowModal()
 {

-    m_endModalCalled = FALSE;
-    if ( !IsModal() )
+    wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") );
+
+    m_endModalCalled = false;
+
+    Show();
+
+    // EndModal may have been called from InitDialog handler (called from
+    // inside Show()), which would cause an infinite loop if we didn't take it
+    // into account
+    if ( !m_endModalCalled )

     {
     {

-        SetModal(TRUE);
-    }
+        // modal dialog needs a parent window, so try to find one
+        wxWindow *parent = GetParent();
+        if ( !parent )
+        {
+            parent = FindSuitableParent();
+        }
+
+        // remember where the focus was
+        wxWindow *oldFocus = m_oldFocus;
+        if ( !oldFocus )
+        {
+            // VZ: do we really want to do this?
+            oldFocus = parent;
+        }
+
+        // We have to remember the HWND because we need to check
+        // the HWND still exists (oldFocus can be garbage when the dialog
+        // exits, if it has been destroyed)
+        HWND hwndOldFocus = oldFocus ? GetHwndOf(oldFocus) : NULL;
+
+
+        // enter and run the modal loop
+        {
+            wxDialogModalDataTiedPtr modalData(&m_modalData,
+                                               new wxDialogModalData(this));
+            modalData->RunLoop();
+        }

 
 

-    Show(TRUE);
+
+        // and restore focus
+        // Note that this code MUST NOT access the dialog object's data
+        // in case the object has been deleted (which will be the case
+        // for a modal dialog that has been destroyed before calling EndModal).
+        if ( oldFocus && (oldFocus != this) && ::IsWindow(hwndOldFocus))
+        {
+            // This is likely to prove that the object still exists
+            if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
+                oldFocus->SetFocus();
+        }
+    }

 
     return GetReturnCode();
 }
 
 
     return GetReturnCode();
 }
 

-// NB: this function (surprizingly) may be called for both modal and modeless
-//     dialogs and should work for both of them

 void wxDialog::EndModal(int retCode)
 {
 void wxDialog::EndModal(int retCode)
 {

-    m_endModalCalled = TRUE;
+    wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );
+
+    m_endModalCalled = true;

     SetReturnCode(retCode);
 
     SetReturnCode(retCode);
 

-    Show(FALSE);
+    Hide();
+}
+
+void wxDialog::EndDialog(int rc)
+{
+    if ( IsModal() )
+        EndModal(rc);
+    else
+        Hide();

 }
 
 // ----------------------------------------------------------------------------
 // wxWin event handlers
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxWin event handlers
 // ----------------------------------------------------------------------------
 

+bool wxDialog::EmulateButtonClickIfPresent(int id)
+{
+    wxButton *btn = wxDynamicCast(FindWindow(id), wxButton);
+
+    if ( !btn || !btn->IsEnabled() || !btn->IsShown() )
+        return false;
+
+    btn->MSWCommand(BN_CLICKED, 0 /* unused */);
+    return true;
+}
+

 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
   if ( Validate() && TransferDataFromWindow() )
   {
 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
   if ( Validate() && TransferDataFromWindow() )
   {

-      EndModal(wxID_OK);
+      EndDialog(wxID_OK);

   }
 }
 
   }
 }
 


@@ -393,7 +410,7 @@ void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 
 void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {

-    EndModal(wxID_CANCEL);
+    EndDialog(wxID_CANCEL);

 }
 
 void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 }
 
 void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))


@@ -428,25 +445,110 @@ void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 {
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 {

-#if wxUSE_CTL3D
-    Ctl3dColorChange();
-#else

     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
     Refresh();
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
     Refresh();

-#endif

 }
 
 }
 

+#ifdef __POCKETPC__
+// Responds to the OK button in a PocketPC titlebar. This
+// can be overridden, or you can change the id used for
+// sending the event, by calling SetAffirmativeId.
+bool wxDialog::DoOK()
+{
+    const int idOk = GetAffirmativeId();
+    if ( EmulateButtonClickIfPresent(idOk) )
+        return true;
+
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
+    event.SetEventObject(this);
+
+    return GetEventHandler()->ProcessEvent(event);
+}
+#endif // __POCKETPC__
+
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+// create main toolbar by calling OnCreateToolBar()
+wxToolBar* wxDialog::CreateToolBar(long style, wxWindowID winid, const wxString& name)
+{
+    m_dialogToolBar = OnCreateToolBar(style, winid, name);
+
+    return m_dialogToolBar;
+}
+
+// return a new toolbar
+wxToolBar *wxDialog::OnCreateToolBar(long style,
+                                       wxWindowID winid,
+                                       const wxString& name)
+{
+    return new wxToolMenuBar(this, winid,
+                         wxDefaultPosition, wxDefaultSize,
+                         style, name);
+}
+#endif
+

 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------

-// dialog window proc
+// dialog Windows messages processing

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+bool wxDialog::MSWProcessMessage(WXMSG* pMsg)
+{
+    const MSG * const msg = wx_reinterpret_cast(MSG *, pMsg);
+    if ( msg->message == WM_KEYDOWN && msg->wParam == VK_ESCAPE )
+    {
+        int idCancel = GetEscapeId();
+        switch ( idCancel )
+        {
+            case wxID_NONE:
+                // don't handle Esc specially at all
+                break;
+
+            case wxID_ANY:
+                // this value is special: it means translate Esc to wxID_CANCEL
+                // but if there is no such button, then fall back to wxID_OK
+                if ( EmulateButtonClickIfPresent(wxID_CANCEL) )
+                    return true;
+                idCancel = wxID_OK;
+                // fall through
+
+            default:
+                // translate Esc to button press for the button with given id
+                if ( EmulateButtonClickIfPresent(idCancel) )
+                    return true;
+        }
+    }
+
+    return wxDialogBase::MSWProcessMessage(pMsg);
+}
+
+WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-    long rc = 0;
-    bool processed = FALSE;
+    WXLRESULT rc = 0;
+    bool processed = false;

 
     switch ( message )
     {
 
     switch ( message )
     {

+#ifdef __WXWINCE__
+        // react to pressing the OK button in the title
+        case WM_COMMAND:
+        {
+            switch ( LOWORD(wParam) )
+            {
+#ifdef __POCKETPC__
+                case IDOK:
+                    processed = DoOK();
+                    if (!processed)
+                        processed = !Close();
+#endif
+#ifdef __SMARTPHONE__
+                case IDM_LEFT:
+                case IDM_RIGHT:
+                    processed = HandleCommand( LOWORD(wParam) , 0 , NULL );
+                    break;
+#endif // __SMARTPHONE__
+            }
+            break;
+        }
+#endif

         case WM_CLOSE:
             // if we can't close, tell the system that we processed the
             // message - otherwise it would close us
         case WM_CLOSE:
             // if we can't close, tell the system that we processed the
             // message - otherwise it would close us


@@ -461,10 +563,10 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             // help with it - so we have to refresh it manually which certainly
             // creates flicker but at least doesn't show garbage on the screen
             rc = wxWindow::MSWWindowProc(message, wParam, lParam);
             // help with it - so we have to refresh it manually which certainly
             // creates flicker but at least doesn't show garbage on the screen
             rc = wxWindow::MSWWindowProc(message, wParam, lParam);

-            processed = TRUE;
+            processed = true;

             if ( HasFlag(wxFULL_REPAINT_ON_RESIZE) )
             {
             if ( HasFlag(wxFULL_REPAINT_ON_RESIZE) )
             {

-                ::InvalidateRect(GetHwnd(), NULL, FALSE /* erase bg */);
+                ::InvalidateRect(GetHwnd(), NULL, false /* erase bg */);

             }
             break;
 
             }
             break;
 


@@ -473,7 +575,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             // we want to override the busy cursor for modal dialogs:
             // typically, wxBeginBusyCursor() is called and then a modal dialog
             // is shown, but the modal dialog shouldn't have hourglass cursor
             // we want to override the busy cursor for modal dialogs:
             // typically, wxBeginBusyCursor() is called and then a modal dialog
             // is shown, but the modal dialog shouldn't have hourglass cursor

-            if ( IsModalShowing() && wxIsBusy() )
+            if ( IsModal() && wxIsBusy() )

             {
                 // set our cursor for all windows (but see below)
                 wxCursor cursor = m_cursor;
             {
                 // set our cursor for all windows (but see below)
                 wxCursor cursor = m_cursor;


@@ -484,14 +586,14 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 
                 // in any case, stop here and don't let wxWindow process this
                 // message (it would set the busy cursor)
 
                 // in any case, stop here and don't let wxWindow process this
                 // message (it would set the busy cursor)

-                processed = TRUE;
+                processed = true;

 
 

-                // but return FALSE to tell the child window (if the event
+                // but return false to tell the child window (if the event

                 // comes from one of them and not from ourselves) that it can
                 // set its own cursor if it has one: thus, standard controls
                 // (e.g. text ctrl) still have correct cursors in a dialog
                 // invoked while wxIsBusy()
                 // comes from one of them and not from ourselves) that it can
                 // set its own cursor if it has one: thus, standard controls
                 // (e.g. text ctrl) still have correct cursors in a dialog
                 // invoked while wxIsBusy()

-                rc = FALSE;
+                rc = false;

             }
             break;
 #endif // __WXMICROWIN__
             }
             break;
 #endif // __WXMICROWIN__


@@ -503,18 +605,3 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
     return rc;
 }
 
     return rc;
 }
 

-#if wxUSE_CTL3D
-
-// Define for each class of dialog and control
-WXHBRUSH wxDialog::OnCtlColor(WXHDC WXUNUSED(pDC),
-                              WXHWND WXUNUSED(pWnd),
-                              WXUINT WXUNUSED(nCtlColor),
-                              WXUINT message,
-                              WXWPARAM wParam,
-                              WXLPARAM lParam)
-{
-    return (WXHBRUSH)Ctl3dCtlColorEx(message, wParam, lParam);
-}
-
-#endif // wxUSE_CTL3D
-