Added ability to switch off more components of the size page UI

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index cc22686d7f202a4d398032e06d2bcaef9090591e..67144e1bba6e710e3993d41fc31ec51720722807 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include "wx/dialog.h"
 #endif
 
 #include "wx/dialog.h"

+#include "wx/testing.h"

 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"


@@ -50,64 +51,6 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxDialogStyle )
-
-wxBEGIN_FLAGS( wxDialogStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxNO_BORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-
-    // dialog styles
-    wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
-    wxFLAGS_MEMBER(wxSTAY_ON_TOP)
-    wxFLAGS_MEMBER(wxCAPTION)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxTHICK_FRAME)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxSYSTEM_MENU)
-    wxFLAGS_MEMBER(wxRESIZE_BORDER)
-#if WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxRESIZE_BOX)
-#endif // WXWIN_COMPATIBILITY_2_6
-    wxFLAGS_MEMBER(wxCLOSE_BOX)
-    wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
-    wxFLAGS_MEMBER(wxMINIMIZE_BOX)
-wxEND_FLAGS( wxDialogStyle )
-
-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 , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-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)
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-#endif
-

 // ----------------------------------------------------------------------------
 // wxDialogModalData
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDialogModalData
 // ----------------------------------------------------------------------------


@@ -252,15 +195,12 @@ bool wxDialog::Show(bool show)
     return true;
 }
 
     return true;
 }
 

-void wxDialog::Raise()
-{
-    ::SetForegroundWindow(GetHwnd());
-}
-

 // show dialog modally
 int wxDialog::ShowModal()
 {
 // show dialog modally
 int wxDialog::ShowModal()
 {

-    wxASSERT_MSG( !IsModal(), _T("ShowModal() can't be called twice") );
+    WX_TESTING_SHOW_MODAL_HOOK();
+
+    wxASSERT_MSG( !IsModal(), wxT("ShowModal() can't be called twice") );

 
     Show();
 
 
     Show();
 


@@ -279,7 +219,7 @@ int wxDialog::ShowModal()
 
 void wxDialog::EndModal(int retCode)
 {
 
 void wxDialog::EndModal(int retCode)
 {

-    wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );
+    wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") );

 
     SetReturnCode(retCode);
 
 
     SetReturnCode(retCode);
 


@@ -336,7 +276,7 @@ void wxDialog::DestroyGripper()
         // have been called yet)
         wxASSERT_MSG( !IsShown() ||
                       ::GetWindow((HWND)m_hGripper, GW_HWNDNEXT) == 0,
         // have been called yet)
         wxASSERT_MSG( !IsShown() ||
                       ::GetWindow((HWND)m_hGripper, GW_HWNDNEXT) == 0,

-            _T("Bug in wxWidgets: gripper should be at the bottom of Z-order") );
+            wxT("Bug in wxWidgets: gripper should be at the bottom of Z-order") );

         ::DestroyWindow((HWND) m_hGripper);
         m_hGripper = 0;
     }
         ::DestroyWindow((HWND) m_hGripper);
         m_hGripper = 0;
     }


@@ -344,7 +284,7 @@ void wxDialog::DestroyGripper()
 
 void wxDialog::ShowGripper(bool show)
 {
 
 void wxDialog::ShowGripper(bool show)
 {

-    wxASSERT_MSG( m_hGripper, _T("shouldn't be called if we have no gripper") );
+    wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );

 
     if ( show )
         ResizeGripper();
 
     if ( show )
         ResizeGripper();


@@ -354,7 +294,7 @@ void wxDialog::ShowGripper(bool show)
 
 void wxDialog::ResizeGripper()
 {
 
 void wxDialog::ResizeGripper()
 {

-    wxASSERT_MSG( m_hGripper, _T("shouldn't be called if we have no gripper") );
+    wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );

 
     HWND hwndGripper = (HWND)m_hGripper;
 
 
     HWND hwndGripper = (HWND)m_hGripper;
 


@@ -478,7 +418,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
             }
 #endif // wxUSE_DIALOG_SIZEGRIP
 
             }
 #endif // wxUSE_DIALOG_SIZEGRIP
 

-            // the Windows dialogs unfortunately are not meant to be resizeable
+            // the Windows dialogs unfortunately are not meant to be resizable

             // at all and their standard class doesn't include CS_[VH]REDRAW
             // styles which means that the window is not refreshed properly
             // after the resize and no amount of WS_CLIPCHILDREN/SIBLINGS can
             // at all and their standard class doesn't include CS_[VH]REDRAW
             // styles which means that the window is not refreshed properly
             // after the resize and no amount of WS_CLIPCHILDREN/SIBLINGS can


@@ -501,7 +441,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
             {
                 // 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;

-                if ( !cursor.Ok() )
+                if ( !cursor.IsOk() )

                     cursor = wxCURSOR_ARROW;
 
                 ::SetCursor(GetHcursorOf(cursor));
                     cursor = wxCURSOR_ARROW;
 
                 ::SetCursor(GetHcursorOf(cursor));


@@ -522,7 +462,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
     }
 
     if ( !processed )
     }
 
     if ( !processed )

-        rc = wxWindow::MSWWindowProc(message, wParam, lParam);
+        rc = wxDialogBase::MSWWindowProc(message, wParam, lParam);

 
     return rc;
 }
 
     return rc;
 }