*** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -216,6 +216,8 @@ protected:
|
||||
WXHBRUSH m_oldBrush;
|
||||
WXHFONT m_oldFont;
|
||||
WXHPALETTE m_oldPalette;
|
||||
|
||||
float m_scaleFactor; // wxPSDC wants to have this. Will disappear.
|
||||
};
|
||||
#endif
|
||||
// _WX_DC_H_
|
||||
|
@@ -65,6 +65,7 @@ public:
|
||||
virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
|
||||
virtual bool OnDrop(wxCoord x, wxCoord y);
|
||||
virtual bool OnData(wxCoord x, wxCoord y);
|
||||
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult vResult);
|
||||
virtual bool GetData();
|
||||
|
||||
// implementation
|
||||
@@ -94,6 +95,7 @@ public:
|
||||
virtual bool OnData( wxCoord x
|
||||
,wxCoord y
|
||||
);
|
||||
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult vResult);
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -115,6 +117,7 @@ public:
|
||||
virtual bool OnData( wxCoord x
|
||||
,wxCoord y
|
||||
);
|
||||
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult vResult);
|
||||
};
|
||||
|
||||
#endif //__OS2DNDH__
|
||||
|
@@ -24,8 +24,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
|
||||
class WXDLLEXPORT wxMenuBar;
|
||||
class WXDLLEXPORT wxStatusBar;
|
||||
|
||||
class WXDLLEXPORT wxFrame: public wxWindow {
|
||||
|
||||
class WXDLLEXPORT wxFrame: public wxWindow
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxFrame)
|
||||
|
||||
public:
|
||||
|
@@ -30,7 +30,7 @@
|
||||
// General features
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#define wxUSE_NET_API 1 // Utilize OS/2's UPM netapi's
|
||||
#define wxUSE_NET_API 0 // Utilize OS/2's UPM netapi's
|
||||
|
||||
#define wxUSE_CONFIG 1
|
||||
// Use wxConfig, with CreateConfig in wxApp
|
||||
@@ -70,8 +70,6 @@
|
||||
#define wxUSE_DRAG_AND_DROP 1
|
||||
// 0 for no drag and drop
|
||||
|
||||
#define wxUSE_TOOLBAR 1
|
||||
// Define 1 to use toolbar classes
|
||||
#define wxUSE_BUTTONBAR 1
|
||||
// Define 1 to use buttonbar classes (enhanced toolbar
|
||||
// for MS Windows)
|
||||
|
@@ -30,7 +30,7 @@
|
||||
// General features
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#define wxUSE_NET_API 1 // Utilize OS/2's UPM netapi's
|
||||
#define wxUSE_NET_API 0 // Utilize OS/2's UPM netapi's
|
||||
|
||||
#define wxUSE_CONFIG 1
|
||||
// Use wxConfig, with CreateConfig in wxApp
|
||||
|
Reference in New Issue
Block a user