projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxExecute takes a char**, not a wxChar**
[wxWidgets.git]
/
src
/
msw
/
minifram.cpp
diff --git
a/src/msw/minifram.cpp
b/src/msw/minifram.cpp
index 57464f4e1882588a55aa476854ac84d6b78a9a1b..e76e9f15dec0f75f9e7cf2297d7f2f1fad037acb 100644
(file)
--- a/
src/msw/minifram.cpp
+++ b/
src/msw/minifram.cpp
@@
-6,7
+6,7
@@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence:
wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@
-35,9
+35,7
@@
#include "wx/minifram.h"
#include "wx/minifram.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
-#endif
#else
#else
@@
-48,16
+46,12
@@
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
#include "wx/minifram.h"
#ifndef __TWIN32__
#include "wx/minifram.h"
#ifndef __TWIN32__
-#ifdef __GNUWIN32__
-#ifndef wxUSE_NORLANDER_HEADERS
-#include "wx/msw/gnuwin32/extra.h"
-#endif
-#endif
+ #ifdef __GNUWIN32_OLD__
+ #include "wx/msw/gnuwin32/extra.h"
+ #endif
#endif
#endif
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
-#endif
long wxMiniFrame::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
long wxMiniFrame::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{