X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c23a0b01b3fb667ec41fc8271ce1ee5b5aa4e19..a60c99e6a919bad02f33ee1429a831f00b0df819:/include/wx/stubs/window.h

diff --git a/include/wx/stubs/window.h b/include/wx/stubs/window.h
index 28c3441317..541dd58040 100644
--- a/include/wx/stubs/window.h
+++ b/include/wx/stubs/window.h
@@ -67,7 +67,7 @@ class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxValidator;
 
 #if USE_DRAG_AND_DROP
-class wxDropTarget;
+class WXDLLEXPORT wxDropTarget;
 #endif
 
 #if USE_WX_RESOURCES
@@ -311,6 +311,15 @@ public:
   inline virtual void SetForegroundColour(const wxColour& col);
   inline virtual wxColour GetForegroundColour() const;
 
+  // Set/get window default background colour (for children to inherit).
+  // NOTE: these may be removed in later revisions.
+  inline virtual void SetDefaultBackgroundColour(const wxColour& col);
+  inline virtual wxColour GetDefaultBackgroundColour(void) const;
+
+  // Set/get window default foreground colour (for children to inherit)
+  inline virtual void SetDefaultForegroundColour(const wxColour& col);
+  inline virtual wxColour GetDefaultForegroundColour(void) const;
+
   // Get the default button, if there is one
   inline virtual wxButton *GetDefaultItem() const;
   inline virtual void SetDefaultItem(wxButton *but);
@@ -382,11 +391,6 @@ public:
   // Executes the default message
   virtual long Default();
 
-/* TODO: implement your own data access
-  virtual WXHWND GetHWND() const ;
-  virtual void SetHWND(WXHWND hWnd);
-*/
-
 /* TODO: you may need something like this
   // Determine whether 3D effects are wanted
   virtual WXDWORD Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D);
@@ -397,6 +401,8 @@ public:
                                        // (but doesn't delete the child object)
   virtual void DestroyChildren();  // Removes and destroys all children
 
+  inline bool IsBeingDeleted() const { return FALSE; } // TODO: Should probably eliminate this
+
   // Constraint implementation
   void UnsetConstraints(wxLayoutConstraints *c);
   inline wxList *GetConstraintsInvolvedIn() const ;
@@ -428,9 +434,8 @@ public:
 
   wxObject *GetChild(int number) const ;
 
-  inline void SetShowing(bool show);
-  inline bool IsUserEnabled() const;
-  inline bool GetTransparentBackground() const ;
+  // Generates a new id for controls
+  static int NewControlId();
 
   // Responds to colour changes: passes event on to children.
   void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -455,8 +460,6 @@ protected:
   bool                  m_autoLayout;                            // Whether to call Layout() in OnSize
   wxWindow *            m_windowParent;                     // Each window always knows its parent
   wxValidator *         m_windowValidator;
-  bool                  m_inOnSize; 			// Protection against OnSize reentry
-  bool                  m_winEnabled;
   int                   m_minSizeX;
   int                   m_minSizeY;
   int                   m_maxSizeX;
@@ -468,7 +471,6 @@ protected:
   bool                  m_caretEnabled;
   bool                  m_caretShown;
   wxFont                m_windowFont;                               // Window's font
-  bool                  m_isShown;
   wxCursor              m_windowCursor;                        // Window's cursor
   wxString              m_windowName;                            // Window name
 
@@ -476,31 +478,14 @@ protected:
 
   wxColour              m_backgroundColour ;
   wxColour              m_foregroundColour ;
-  bool                  m_backgroundTransparent;
-
-  int                   m_xThumbSize;
-  int                   m_yThumbSize;
-
-  float                 m_lastXPos;
-  float                 m_lastYPos;
-  int                   m_lastEvent;
-
-  bool                  m_mouseInWindow;
+  wxColour              m_defaultBackgroundColour;
+  wxColour              m_defaultForegroundColour;
 
 #if USE_DRAG_AND_DROP
   wxDropTarget         *m_pDropTarget;    // the current drop target or NULL
 #endif  //USE_DRAG_AND_DROP
 
 public:
-/* TODO: implementation of window handle, note of last message, etc.
-  WXHWND                m_hWnd; 			// MS Windows window handle
-  WXUINT                m_lastMsg;
-  WXWPARAM              m_lastWParam;
-  WXLPARAM              m_lastLParam;
-  WXHMENU               m_hMenu; // Menu, if any
-
-*/
-
   wxRegion              m_updateRegion;
   wxList *              m_children;                           // Window's children
   int                   m_returnCode;
@@ -523,8 +508,6 @@ inline wxString wxWindow::GetName() const { return m_windowName; }
 inline void wxWindow::SetName(const wxString& name) { m_windowName = name; }
 inline long wxWindow::GetWindowStyleFlag() const { return m_windowStyle; }
 inline void wxWindow::SetWindowStyleFlag(long flag) { m_windowStyle = flag; }
-inline void wxWindow::SetDoubleClick(bool flag) { m_doubleClickAllowed = flag; }
-inline bool wxWindow::GetDoubleClick() const { return m_doubleClickAllowed; }
 inline void wxWindow::SetEventHandler(wxEvtHandler *handler) { m_windowEventHandler = handler; }
 inline wxEvtHandler *wxWindow::GetEventHandler() const { return m_windowEventHandler; }
 inline void wxWindow::SetAutoLayout(bool a) { m_autoLayout = a; }
@@ -534,19 +517,20 @@ inline void wxWindow::SetBackgroundColour(const wxColour& col) { m_backgroundCol
 inline wxColour wxWindow::GetBackgroundColour() const { return m_backgroundColour; };
 inline void wxWindow::SetForegroundColour(const wxColour& col) { m_foregroundColour = col; };
 inline wxColour wxWindow::GetForegroundColour() const { return m_foregroundColour; };
+inline void wxWindow::SetDefaultForegroundColour(const wxColour& col) { m_defaultForegroundColour = col; };
+inline wxColour wxWindow::GetDefaultForegroundColour(void) const { return m_defaultForegroundColour; };
+inline void wxWindow::SetDefaultBackgroundColour(const wxColour& col) { m_defaultBackgroundColour = col; };
+inline wxColour wxWindow::GetDefaultBackgroundColour(void) const { return m_defaultBackgroundColour; };
 
 inline wxButton *wxWindow::GetDefaultItem() const { return m_defaultItem; }
 inline void wxWindow::SetDefaultItem(wxButton *but) { m_defaultItem = but; }
 inline bool wxWindow::IsRetained() const { return ((m_windowStyle & wxRETAINED) == wxRETAINED); }
 
-inline void wxWindow::SetShowing(bool show) { m_isShown = show; }
 inline wxList *wxWindow::GetConstraintsInvolvedIn() const { return m_constraintsInvolvedIn; }
 inline wxSizer *wxWindow::GetSizer() const { return m_windowSizer; }
 inline wxWindow *wxWindow::GetSizerParent() const { return m_sizerParent; }
 inline void wxWindow::SetSizerParent(wxWindow *win) { m_sizerParent = win; }
 inline wxValidator *wxWindow::GetValidator() const { return m_windowValidator; }
-inline bool wxWindow::IsUserEnabled() const { return m_winEnabled; }
-inline bool wxWindow::GetTransparentBackground() const { return m_backgroundTransparent; }
 inline void wxWindow::SetReturnCode(int retCode) { m_returnCode = retCode; }
 inline int wxWindow::GetReturnCode() { return m_returnCode; }