[ 1515213 ] Combo sample improvements.

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

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index 81a0ff45e788a9f39911ed30967288f2a1b25d98..99e6b11d2c9b3ca5e06b4bfe718217650d7bf16c 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.cpp
+// Name:        src/os2/dialog.cpp

 // Purpose:     wxDialog class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxDialog class
 // Author:      David Webster
 // Modified by:


@@ -12,18 +12,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifndef WX_PRECOMP

 #include "wx/dialog.h"
 #include "wx/dialog.h"

-#include "wx/utils.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/settings.h"
-#include "wx/intl.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/app.h"
+    #include "wx/settings.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"

-#include "wx/log.h"

 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 
 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 


@@ -83,21 +83,19 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
 void wxDialog::Init()
 {
     m_pOldFocus = (wxWindow *)NULL;
 void wxDialog::Init()
 {
     m_pOldFocus = (wxWindow *)NULL;

-    m_isShown = FALSE;
+    m_isShown = false;

     m_pWindowDisabler = (wxWindowDisabler *)NULL;
     m_modalData = NULL;
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 } // end of wxDialog::Init
 
     m_pWindowDisabler = (wxWindowDisabler *)NULL;
     m_modalData = NULL;
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 } // end of wxDialog::Init
 

-bool wxDialog::Create(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxString&                   rsTitle
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-, const wxString&                   rsName
-)
+bool wxDialog::Create( wxWindow*       pParent,
+                       wxWindowID      vId,
+                       const wxString& rsTitle,
+                       const wxPoint&  rPos,
+                       const wxSize&   rSize,
+                       long            lStyle,
+                       const wxString& rsName )

 {
     Init();
     SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
 {
     Init();
     SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);


@@ -120,7 +118,8 @@ bool wxDialog::Create(
                                   ,lStyle
                                   ,rsName
                                  ))
                                   ,lStyle
                                   ,rsName
                                  ))

-        return FALSE;
+        return false;
+

     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     //
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     //


@@ -128,9 +127,11 @@ bool wxDialog::Create(
     //
     if (!rsTitle.IsNull())
         SetTitle(rsTitle);
     //
     if (!rsTitle.IsNull())
         SetTitle(rsTitle);

-    return TRUE;
+    return true;

 } // end of wxDialog::Create
 
 } // end of wxDialog::Create
 

+#if WXWIN_COMPATIBILITY_2_6
+

 // deprecated ctor
 wxDialog::wxDialog(wxWindow *parent,
                    const wxString& title,
 // deprecated ctor
 wxDialog::wxDialog(wxWindow *parent,
                    const wxString& title,


@@ -147,16 +148,16 @@ wxDialog::wxDialog(wxWindow *parent,
     Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
 }
 
     Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
 }
 

-void wxDialog::SetModal(
-  bool                              WXUNUSED(bFlag)
-)
+void wxDialog::SetModal(bool WXUNUSED(bFlag))

 {
     // nothing to do, obsolete method
 } // end of wxDialog::SetModal
 
 {
     // nothing to do, obsolete method
 } // end of wxDialog::SetModal
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

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

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

 
     // this will also reenable all the other windows for a modal dialog
     Show(false);
 
     // this will also reenable all the other windows for a modal dialog
     Show(false);


@@ -200,11 +201,14 @@ void wxDialog::OnCharHook(
 // showing the dialogs
 // ----------------------------------------------------------------------------
 
 // showing the dialogs
 // ----------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY_2_6
+

 bool wxDialog::IsModalShowing() const
 {
     return IsModal();
 } // end of wxDialog::IsModalShowing
 
 bool wxDialog::IsModalShowing() const
 {
     return IsModal();
 } // end of wxDialog::IsModalShowing
 

+#endif // WXWIN_COMPATIBILITY_2_6

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


@@ -228,9 +232,7 @@ wxWindow *wxDialog::FindSuitableParent() const
     return parent;
 }
 
     return parent;
 }
 

-bool wxDialog::Show(
-  bool                              bShow
-)
+bool wxDialog::Show( bool bShow )

 {
     if ( bShow == IsShown() )
         return false;
 {
     if ( bShow == IsShown() )
         return false;


@@ -262,13 +264,14 @@ bool wxDialog::Show(
 
     wxDialogBase::Show(bShow);
 
 
     wxDialogBase::Show(bShow);
 

-    if (GetTitle().c_str())
-        ::WinSetWindowText((HWND)GetHwnd(), (PSZ)GetTitle().c_str());
+    wxString title = GetTitle();
+    if (!title.empty())
+        ::WinSetWindowText((HWND)GetHwnd(), (PSZ)title.c_str());

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

-        // other windows and so could start their life non laid out correctly
+        // other windows and so could start their life not laid out correctly

         // if we didn't call Layout() from here
         //
         // NB: normally we should call it just the first time but doing it
         // if we didn't call Layout() from here
         //
         // NB: normally we should call it just the first time but doing it


@@ -280,7 +283,7 @@ bool wxDialog::Show(
 } // end of wxDialog::Show
 
 //
 } // end of wxDialog::Show
 
 //

-// Replacement for Show(TRUE) for modal dialogs - returns return code
+// Replacement for Show(true) for modal dialogs - returns return code

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


@@ -323,7 +326,7 @@ int wxDialog::ShowModal()
         extern bool                     gbInOnIdle;
         bool                            bWasInOnIdle = gbInOnIdle;
 
         extern bool                     gbInOnIdle;
         bool                            bWasInOnIdle = gbInOnIdle;
 

-        gbInOnIdle = FALSE;
+        gbInOnIdle = false;

 
         // enter and run the modal loop
         {
 
         // enter and run the modal loop
         {


@@ -372,18 +375,14 @@ void wxDialog::EndDialog(int rc)
 // wxWin event handlers
 // ----------------------------------------------------------------------------
 
 // wxWin event handlers
 // ----------------------------------------------------------------------------
 

-void wxDialog::OnApply(
-  wxCommandEvent&                   rEvent
-)
+void wxDialog::OnApply( wxCommandEvent& WXUNUSED(rEvent) )

 {
     if (Validate())
         TransferDataFromWindow();
 } // end of wxDialog::OnApply
 
 // Standard buttons
 {
     if (Validate())
         TransferDataFromWindow();
 } // end of wxDialog::OnApply
 
 // Standard buttons

-void wxDialog::OnOK(
-  wxCommandEvent&                   rEvent
-)
+void wxDialog::OnOK( wxCommandEvent& WXUNUSED(rEvent) )

 {
     if ( Validate() && TransferDataFromWindow() )
     {
 {
     if ( Validate() && TransferDataFromWindow() )
     {


@@ -391,16 +390,12 @@ void wxDialog::OnOK(
     }
 } // end of wxDialog::OnOK
 
     }
 } // end of wxDialog::OnOK
 

-void wxDialog::OnCancel(
-  wxCommandEvent&                   rEvent
-)
+void wxDialog::OnCancel( wxCommandEvent& WXUNUSED(rEvent) )

 {
     EndDialog(wxID_CANCEL);
 } // end of wxDialog::OnCancel
 
 {
     EndDialog(wxID_CANCEL);
 } // end of wxDialog::OnCancel
 

-void wxDialog::OnCloseWindow(
-  wxCloseEvent&                     rEvent
-)
+void wxDialog::OnCloseWindow( wxCloseEvent& WXUNUSED(rEvent) )

 {
     //
     // We'll send a Cancel message by default, which may close the dialog.
 {
     //
     // We'll send a Cancel message by default, which may close the dialog.


@@ -427,7 +422,7 @@ void wxDialog::OnCloseWindow(
 
     closing.Append(this);
 
 
     closing.Append(this);
 

-    wxCommandEvent                  vCancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+    wxCommandEvent vCancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);

 
     vCancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(vCancelEvent); // This may close the dialog
 
     vCancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(vCancelEvent); // This may close the dialog


@@ -435,22 +430,16 @@ void wxDialog::OnCloseWindow(
     closing.DeleteObject(this);
 } // end of wxDialog::OnCloseWindow
 
     closing.DeleteObject(this);
 } // end of wxDialog::OnCloseWindow
 

-void wxDialog::OnSysColourChanged(
-  wxSysColourChangedEvent&          rEvent
-)
+void wxDialog::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(rEvent) )

 {
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
     Refresh();
 } // end of wxDialog::OnSysColourChanged
 
 {
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
     Refresh();
 } // end of wxDialog::OnSysColourChanged
 

-MRESULT wxDialog::OS2WindowProc(
-  WXUINT                            uMessage
-, WXWPARAM                          wParam
-, WXLPARAM                          lParam
-)
+MRESULT wxDialog::OS2WindowProc( WXUINT uMessage, WXWPARAM wParam, WXLPARAM lParam )

 {
 {

-    MRESULT                         rc = 0;
-    bool                            bProcessed = FALSE;
+    MRESULT  rc = 0;
+    bool     bProcessed = false;

 
     switch (uMessage)
     {
 
     switch (uMessage)
     {


@@ -470,4 +459,3 @@ MRESULT wxDialog::OS2WindowProc(
                                     );
     return rc;
 } // end of wxDialog::OS2WindowProc
                                     );
     return rc;
 } // end of wxDialog::OS2WindowProc

-