Changeset ab3e1260b7d6d342fb8e019144054b37026198fb

Timestamp:

01/10/04 00:17:54 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1096582674 +0000

git-parent:

[49abe97532f9af69b8a4bd3cb94e508bacde3f76]

git-author:

Gildas Bazin <gbazin@videolan.org> 1096582674 +0000

Message:

* modules/gui/wxwindows/*: win32 fixes with new wxWidgets.

Files:

• modules/gui/wxwindows/interface.cpp (modified) (1 diff)
• modules/gui/wxwindows/preferences.cpp (modified) (2 diffs)
• modules/gui/wxwindows/wxwindows.cpp (modified) (1 diff)

modules/gui/wxwindows/interface.cpp

@@ -373 +373 @@
-            22 /* approximate margin */;
-#else
+#if (wxMAJOR_VERSION <= 2) && (wxMINOR_VERSION <= 5) && (wxRELEASE_NUMBER < 3)
-            4 /* approximate margin */;
+#else
+            15 /* approximate margin */;
+#endif
-#endif
-    }

modules/gui/wxwindows/preferences.cpp

@@ -706 +706 @@
-    b_advanced = VLC_TRUE;
-    SetAutoLayout( TRUE );
+    Hide();
-
-    wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
@@ -815 +816 @@
-    sizer->Layout();
-    SetSizer( sizer );
+    Show();
-}
-

modules/gui/wxwindows/wxwindows.cpp

@@ -40 +40 @@
-
-/* Temporary hack */
-
+
+
-/* Hack to detect wxWindows 2.5 which has a different wxEntry() prototype */
-extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,
-                    char *pCmdLine = NULL, int nCmdShow = SW_NORMAL );
-#endif
+#endif
+
-#ifdef SYS_DARWIN
-int wxEntry( int argc, char *argv[] , bool enterLoop = TRUE );