Skip to content

Moved USE_GLFW_CLIPBOARD to header to fix compile errors #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Moved USE_GLFW_CLIPBOARD to header to fix compile errors #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/ofxTextInputField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,18 +322,8 @@ void ofxTextInputField::mouseReleased(ofMouseEventArgs& args){
}
}


#ifdef OF_VERSION_MINOR
#if OF_VERSION_MINOR>=8 || OF_VERSION_MAJOR>0
#define USE_GLFW_CLIPBOARD

#endif
#endif


#ifdef USE_GLFW_CLIPBOARD


#if (_MSC_VER)
#include <GLFW/glfw3.h>
#else
Expand Down
6 changes: 6 additions & 0 deletions src/ofxTextInputField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@
#define TEXTFIELD_IS_ACTIVE "textfieldIsActive"
#define TEXTFIELD_IS_INACTIVE "textfieldIsInactive"

#ifdef OF_VERSION_MINOR
#if OF_VERSION_MINOR>=8 || OF_VERSION_MAJOR>0
#define USE_GLFW_CLIPBOARD
#endif
#endif


// TODO: wrapping
#include "ofxTextInputFieldFontRenderer.h"
Expand Down