X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/066f1b7a9580fc6c487efa753d61e3683de61407..789f8e6ad40488d2dd5f5f4d87e195d0f1e23422:/src/msw/dialog.cpp

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index c26ab68062..d0f9d78dfd 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "dialog.h"
 #endif
 
@@ -68,14 +68,62 @@ static wxWindowList wxModalDialogs;
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-
-/*
-	TODO PROPERTIES
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxDialogStyle )
+
+WX_BEGIN_FLAGS( wxDialogStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
+    WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
+    WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
+    WX_FLAGS_MEMBER(wxBORDER_RAISED)
+    WX_FLAGS_MEMBER(wxBORDER_STATIC)
+    WX_FLAGS_MEMBER(wxBORDER_NONE)
+    
+    // old style border flags
+    WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
+    WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
+    WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
+    WX_FLAGS_MEMBER(wxRAISED_BORDER)
+    WX_FLAGS_MEMBER(wxSTATIC_BORDER)
+    WX_FLAGS_MEMBER(wxNO_BORDER)
+
+    // standard window styles
+    WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
+    WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
+
+    // dialog styles
+    WX_FLAGS_MEMBER(wxDIALOG_MODAL)
+    WX_FLAGS_MEMBER(wxDIALOG_MODELESS)
+    WX_FLAGS_MEMBER(wxNO_3D)
+    WX_FLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
+    WX_FLAGS_MEMBER(wxSTAY_ON_TOP)
+    WX_FLAGS_MEMBER(wxCAPTION)
+    WX_FLAGS_MEMBER(wxTHICK_FRAME)
+    WX_FLAGS_MEMBER(wxSYSTEM_MENU)
+    WX_FLAGS_MEMBER(wxRESIZE_BORDER)
+    WX_FLAGS_MEMBER(wxRESIZE_BOX)
+    WX_FLAGS_MEMBER(wxCLOSE_BOX)
+    WX_FLAGS_MEMBER(wxMAXIMIZE_BOX)
+    WX_FLAGS_MEMBER(wxMINIMIZE_BOX)
+WX_END_FLAGS( wxDialogStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow,"wx/dialog.h")
+
+WX_BEGIN_PROPERTIES_TABLE(wxDialog)
+    WX_PROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    WX_PROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+WX_END_PROPERTIES_TABLE()
+
+WX_BEGIN_HANDLERS_TABLE(wxDialog)
+WX_END_HANDLERS_TABLE()
+
+WX_CONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle) 
 
-		style (wxDEFAULT_DIALOG_STYLE)
-		centered (bool, false )
-*/
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
+#endif
 
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
     EVT_BUTTON(wxID_OK, wxDialog::OnOK)