Fixed compile errors, warnings and other DSMs, and improved comments.

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

diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp
index f17795f54709a2d42f068cf298b5315d38bd7d31..556873599f2059cc1d89d60f9af98bd862ebba2d 100644 (file)
--- a/src/univ/topluniv.cpp
+++ b/src/univ/topluniv.cpp
@@ -76,8 +76,10 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
          exstyleOrig = 0;
 
     if ( ms_drawDecorations == -1 )
          exstyleOrig = 0;
 
     if ( ms_drawDecorations == -1 )

-        ms_drawDecorations = !wxSystemSettings::HasFrameDecorations();
+        ms_drawDecorations = !wxSystemSettings::HasFrameDecorations() ||
+                             wxGetEnv(wxT("WXDECOR"), NULL);

         // FIXME -- wxUniv should provide a way to force non-native decorations!
         // FIXME -- wxUniv should provide a way to force non-native decorations!

+        //          $WXDECOR is just a hack in absence of better wxUniv solution

 
     if ( ms_drawDecorations )
     {
 
     if ( ms_drawDecorations )
     {


@@ -97,15 +99,6 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
                                          size, style, name) )
         return FALSE;
 
                                          size, style, name) )
         return FALSE;
 

-    // FIXME: to be removed as soon as wxTLW/wxFrame/wxDialog creation code in
-    //        wxMSW is rationalized
-#ifdef __WXMSW__
-    extern const wxChar *wxFrameClassName;
-    if ( !MSWCreate(id, NULL, wxFrameClassName, this, title,
-                    pos.x, pos.y, size.x, size.y, style) )
-        return FALSE;
-#endif // __WXMSW__
-

     if ( ms_drawDecorations )
     {
         m_windowStyle = styleOrig;
     if ( ms_drawDecorations )
     {
         m_windowStyle = styleOrig;