add wxMBConvStrictUTF8 class implementing just UTF-8 conversion, without support...

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

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index d87d7ce8af2928d289c16ec2fe06635e2234d0b5..50fa18cacf695e125946afb6e7e58727a9f79129 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -14,10 +14,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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


@@ -25,8 +21,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/dialog.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/dialog.h"

     #include "wx/utils.h"
     #include "wx/app.h"
 #endif
     #include "wx/utils.h"
     #include "wx/app.h"
 #endif


@@ -46,29 +43,12 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 

-wxDialog::wxDialog()
-{
-    Init();
-}
-
-wxDialog::wxDialog(wxWindow *parent,
-                   wxWindowID id,
-                   const wxString& title,
-                   const wxPoint& pos,
-                   const wxSize& size,
-                   long style,
-                   const wxString& name)
-{
-    Init();
-    Create(parent, id, title, pos, size, style, name);
-}
-

 void wxDialog::Init()
 {
     m_returnCode = 0;
     m_windowDisabler = NULL;
     m_eventLoop = NULL;
 void wxDialog::Init()
 {
     m_returnCode = 0;
     m_windowDisabler = NULL;
     m_eventLoop = NULL;

-    m_isShowingModal = FALSE;
+    m_isShowingModal = false;

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


@@ -104,7 +84,7 @@ void wxDialog::OnCancel(wxCommandEvent &WXUNUSED(event))
     else
     {
         SetReturnCode(wxID_CANCEL);
     else
     {
         SetReturnCode(wxID_CANCEL);

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

     }
 }
 
     }
 }
 


@@ -119,7 +99,7 @@ void wxDialog::OnOK(wxCommandEvent &WXUNUSED(event))
         else
         {
             SetReturnCode(wxID_OK);
         else
         {
             SetReturnCode(wxID_OK);

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

         }
     }
 }
         }
     }
 }


@@ -202,9 +182,9 @@ int wxDialog::ShowModal()
         }
     }
 
         }
     }
 

-    Show(TRUE);
+    Show(true);

 
 

-    m_isShowingModal = TRUE;
+    m_isShowingModal = true;

 
     wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
 
 
     wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
 


@@ -234,9 +214,9 @@ void wxDialog::EndModal(int retCode)
         return;
     }
 
         return;
     }
 

-    m_isShowingModal = FALSE;
-    
+    m_isShowingModal = false;
+

     m_eventLoop->Exit();
 
     m_eventLoop->Exit();
 

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

 }
 }