wxTOPLEVEL_EX_DIALOG is a better name than wxTLW_EX_DIALOG

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index bf5fe88226a4fc64beec88a614403d477605595a..157ff3f0f390104c3fe075b8b567623a437ce47e 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -31,7 +31,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
 class WXDLLEXPORT wxTopLevelWindowBase;
 
 // Dialogs are created in a special way
 class WXDLLEXPORT wxTopLevelWindowBase;
 
 // Dialogs are created in a special way

-#define wxTLW_EX_DIALOG             0x00000008
+#define wxTOPLEVEL_EX_DIALOG        0x00000008

 
 // Styles for ShowFullScreen
 // (note that wxTopLevelWindow only handles wxFULLSCREEN_NOBORDER and
 
 // Styles for ShowFullScreen
 // (note that wxTopLevelWindow only handles wxFULLSCREEN_NOBORDER and

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 1b206e4a2d028cd5f5a782394095c6b68a90f21b..445afaf5ae642e7d902faa027e7243db3b57c59d 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -71,7 +71,7 @@ bool wxDialog::Create( wxWindow *parent,
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {

-    SetExtraStyle(GetExtraStyle() | wxTLW_EX_DIALOG);
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
     return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);
 }
 
     return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);
 }

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 1b206e4a2d028cd5f5a782394095c6b68a90f21b..445afaf5ae642e7d902faa027e7243db3b57c59d 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -71,7 +71,7 @@ bool wxDialog::Create( wxWindow *parent,
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {

-    SetExtraStyle(GetExtraStyle() | wxTLW_EX_DIALOG);
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
     return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);
 }
 
     return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);
 }

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index 6a29dbf93d7a6395f273811a40fa8e78a35fa55b..dfb4a5b279c055bb960093e26a043950a496a610 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -46,7 +46,7 @@ bool wxDialog::Create(wxWindow *parent,
                       const wxPoint &pos, const wxSize &size,
                       long style, const wxString &name)
 {
                       const wxPoint &pos, const wxSize &size,
                       long style, const wxString &name)
 {

-    SetExtraStyle(GetExtraStyle() | wxTLW_EX_DIALOG);
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
     // all dialogs should have tab traversal enabled
     style |= wxTAB_TRAVERSAL;
 
     // all dialogs should have tab traversal enabled
     style |= wxTAB_TRAVERSAL;