projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update after adding palmos setup.h to family of automatically created setups.
[wxWidgets.git]
/
include
/
wx
/
frame.h
diff --git
a/include/wx/frame.h
b/include/wx/frame.h
index bd7cc361d6dfdaf00ba18bb755c284cf1658d09d..8d5ce34cc9ccd35dadfb6f983ecf1fe55193179d 100644
(file)
--- a/
include/wx/frame.h
+++ b/
include/wx/frame.h
@@
-16,16
+16,12
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "framebase.h"
-#endif
-
#include "wx/toplevel.h" // the base class
// the default names for various classs
#include "wx/toplevel.h" // the base class
// the default names for various classs
-
WXDLLEXPORT_DATA(extern
const wxChar*) wxFrameNameStr;
-
WXDLLEXPORT_DATA(extern
const wxChar*) wxStatusLineNameStr;
-
WXDLLEXPORT_DATA(extern
const wxChar*) wxToolBarNameStr;
+
extern WXDLLEXPORT_DATA(
const wxChar*) wxFrameNameStr;
+
extern WXDLLEXPORT_DATA(
const wxChar*) wxStatusLineNameStr;
+
extern WXDLLEXPORT_DATA(
const wxChar*) wxToolBarNameStr;
class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxMenuBar;
@@
-78,10
+74,7
@@
public:
// sends a size event to the window using its current size -- this has an
// effect of refreshing the window layout
// sends a size event to the window using its current size -- this has an
// effect of refreshing the window layout
- //
- // currently it is only implemented under MSW but is declared here to make
- // it possible to call it in portable code without using #ifdef's
- virtual void SendSizeEvent() { }
+ virtual void SendSizeEvent();
// menu bar functions
// ------------------
// menu bar functions
// ------------------
@@
-180,11
+173,6
@@
public:
// if you are hiding the help, true otherwise
virtual void DoGiveHelp(const wxString& text, bool show);
// if you are hiding the help, true otherwise
virtual void DoGiveHelp(const wxString& text, bool show);
-#if WXWIN_COMPATIBILITY_2_2
- // call this to simulate a menu command
- bool Command(int winid) { return ProcessCommand(winid); }
-#endif // WXWIN_COMPATIBILITY_2_2
-
protected:
// the frame main menu/status/tool bars
// ------------------------------------
protected:
// the frame main menu/status/tool bars
// ------------------------------------
@@
-250,7
+238,7
@@
protected:
#if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)
#include "wx/univ/frame.h"
#else // !__WXUNIVERSAL__
#if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)
#include "wx/univ/frame.h"
#else // !__WXUNIVERSAL__
- #if defined(__PALMOS__)
+ #if defined(__
WX
PALMOS__)
#include "wx/palmos/frame.h"
#elif defined(__WXMSW__)
#include "wx/msw/frame.h"
#include "wx/palmos/frame.h"
#elif defined(__WXMSW__)
#include "wx/msw/frame.h"